Merge pull request #2695 from yurydelendik/copy-protection-2
Fixes text search for "secured" documents (take 2)
This commit is contained in:
commit
51c81a1d01
@ -298,7 +298,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var gfx = new CanvasGraphics(params.canvasContext, this.commonObjs,
|
var gfx = new CanvasGraphics(params.canvasContext, this.commonObjs,
|
||||||
this.objs, !this.pageInfo.disableTextLayer && params.textLayer);
|
this.objs, params.textLayer);
|
||||||
try {
|
try {
|
||||||
this.display(gfx, params.viewport, complete, continueCallback);
|
this.display(gfx, params.viewport, complete, continueCallback);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -538,8 +538,10 @@ var PDFDocument = (function PDFDocumentClosure() {
|
|||||||
return shadow(this, 'numPages', num);
|
return shadow(this, 'numPages', num);
|
||||||
},
|
},
|
||||||
getDocumentInfo: function PDFDocument_getDocumentInfo() {
|
getDocumentInfo: function PDFDocument_getDocumentInfo() {
|
||||||
|
var encrypt = this.xref.encrypt;
|
||||||
var docInfo = {
|
var docInfo = {
|
||||||
PDFFormatVersion: this.pdfFormatVersion,
|
PDFFormatVersion: this.pdfFormatVersion,
|
||||||
|
IsTextCopyDisabled: encrypt ? encrypt.disableTextCopy : false,
|
||||||
IsAcroFormPresent: !!this.acroForm
|
IsAcroFormPresent: !!this.acroForm
|
||||||
};
|
};
|
||||||
if (this.xref.trailer.has('Info')) {
|
if (this.xref.trailer.has('Info')) {
|
||||||
|
@ -561,7 +561,7 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
|
|||||||
var ownerPassword = stringToBytes(dict.get('O'));
|
var ownerPassword = stringToBytes(dict.get('O'));
|
||||||
var userPassword = stringToBytes(dict.get('U'));
|
var userPassword = stringToBytes(dict.get('U'));
|
||||||
var flags = dict.get('P');
|
var flags = dict.get('P');
|
||||||
this.disableTextLayer = !(flags & 16);
|
this.disableTextCopy = !(flags & 16);
|
||||||
var revision = dict.get('R');
|
var revision = dict.get('R');
|
||||||
var encryptMetadata = algorithm == 4 && // meaningful when V is 4
|
var encryptMetadata = algorithm == 4 && // meaningful when V is 4
|
||||||
dict.get('EncryptMetadata') !== false; // makes true as default value
|
dict.get('EncryptMetadata') !== false; // makes true as default value
|
||||||
|
@ -214,13 +214,11 @@ var WorkerMessageHandler = {
|
|||||||
handler.on('GetPageRequest', function wphSetupGetPage(data) {
|
handler.on('GetPageRequest', function wphSetupGetPage(data) {
|
||||||
var pageNumber = data.pageIndex + 1;
|
var pageNumber = data.pageIndex + 1;
|
||||||
var pdfPage = pdfModel.getPage(pageNumber);
|
var pdfPage = pdfModel.getPage(pageNumber);
|
||||||
var encrypt = pdfModel.xref.encrypt;
|
|
||||||
var page = {
|
var page = {
|
||||||
pageIndex: data.pageIndex,
|
pageIndex: data.pageIndex,
|
||||||
rotate: pdfPage.rotate,
|
rotate: pdfPage.rotate,
|
||||||
ref: pdfPage.ref,
|
ref: pdfPage.ref,
|
||||||
view: pdfPage.view,
|
view: pdfPage.view
|
||||||
disableTextLayer: encrypt ? encrypt.disableTextLayer : false
|
|
||||||
};
|
};
|
||||||
handler.send('GetPage', {pageInfo: page});
|
handler.send('GetPage', {pageInfo: page});
|
||||||
});
|
});
|
||||||
|
@ -1198,6 +1198,14 @@ canvas {
|
|||||||
background-color: rgba(0, 100, 0, 0.2);
|
background-color: rgba(0, 100, 0, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#viewerContainer.copy-protection .textLayer > div {
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewerContainer.copy-protection .textLayer > div > .highlight {
|
||||||
|
visibility: visible;
|
||||||
|
}
|
||||||
|
|
||||||
/* TODO: file FF bug to support ::-moz-selection:window-inactive
|
/* TODO: file FF bug to support ::-moz-selection:window-inactive
|
||||||
so we can override the opaque grey background when the window is inactive;
|
so we can override the opaque grey background when the window is inactive;
|
||||||
see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
|
see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
|
||||||
|
@ -1352,6 +1352,14 @@ var PDFView = {
|
|||||||
// AcroForm/XFA was found
|
// AcroForm/XFA was found
|
||||||
PDFView.fallback();
|
PDFView.fallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (info.IsTextCopyDisabled) {
|
||||||
|
document.getElementById('viewerContainer').classList
|
||||||
|
.add('copy-protection');
|
||||||
|
} else {
|
||||||
|
document.getElementById('viewerContainer').classList
|
||||||
|
.remove('copy-protection');
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user