admin/javascript-obfuscator-javascript-obfuscator
1
0
Fork 0
mirror of https://github.com/javascript-obfuscator/javascript-obfuscator synced 2026-08-09 12:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #825 from javascript-obfuscator/string-array-wrappers-prefix

Browse Source 
Fixed missing prefix of root identifiers added by `stringArrayWrapper…
This commit is contained in:
Timofey Kachalov
2020-11-23 13:19:42 +03:00
committed by GitHub
parent ef7c203c20 ab4508de14
commit 9c98de7cde
8 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,5 +1,9 @@
Change Log
v2.9.4
---
* Fixed missing prefix of root identifiers added by `stringArrayWrappersCount` option when `identifiersPrefix` option is set
v2.9.3
---
* **CLI**: Fixed wrong name of obfuscated files when input directory path is the `.` symbol. https://github.com/javascript-obfuscator/javascript-obfuscator/issues/816
dist/index.browser.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/index.cli.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/index.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "javascript-obfuscator",
"version": "2.9.3",
"version": "2.9.4",
"description": "JavaScript obfuscator",
"keywords": [
"obfuscator",
@@ -69,7 +69,7 @@
"chai-exclude": "2.0.2",
"coveralls": "3.1.0",
"cross-env": "7.0.2",
"eslint": "7.13.0",
"eslint": "7.14.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsdoc": "30.7.8",
"eslint-plugin-no-null": "1.0.2",
src/node-transformers/string-array-transformers/StringArrayTransformer.ts
+4 -1
View File
@@ -331,7 +331,10 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
return stringArrayScopeCallsWrapperNamesDataByEncoding;
}
const nextScopeCallsWrapperName: string = this.identifierNamesGenerator.generateNext();
// have to use `generateForGlobalScope` for program node for correct attach prefix to the calls wrapper name
const nextScopeCallsWrapperName: string = NodeGuards.isProgramNode(currentLexicalScopeBodyNode)
? this.identifierNamesGenerator.generateForGlobalScope()
: this.identifierNamesGenerator.generateNext();
stringArrayScopeCallsWrapperNamesDataByEncoding[encoding] = {
encoding,
test/functional-tests/node-transformers/string-array-transformers/string-array-scope-calls-wrapper-transformer/StringArrayScopeCallsWrapperTransformer.spec.ts
+66
View File
@@ -112,6 +112,38 @@ describe('StringArrayScopeCallsWrapperTransformer', function () {
assert.match(obfuscatedCode, stringArrayCallRegExp);
});
});
describe('Variant #4: `identifiersPrefix` option is set', () => {
const stringArrayCallRegExp: RegExp = new RegExp(
'const foo_d *= *foo_b;' +
'const foo_e *= *foo_b;' +
'const foo *= *foo_[d|e]\\(0x0\\);' +
'const bar *= *foo_[d|e]\\(0x1\\);' +
'const baz *= *foo_[d|e]\\(0x2\\);'
);
let obfuscatedCode: string;
before(() => {
const code: string = readFileAsString(__dirname + '/fixtures/wrappers-count-const.js');
obfuscatedCode = JavaScriptObfuscator.obfuscate(
code,
{
...NO_ADDITIONAL_NODES_PRESET,
identifierNamesGenerator: IdentifierNamesGenerator.MangledIdentifierNamesGenerator,
identifiersPrefix: 'foo_',
stringArray: true,
stringArrayThreshold: 1,
stringArrayWrappersCount: 2
}
).getObfuscatedCode();
});
it('should add scope calls wrappers', () => {
assert.match(obfuscatedCode, stringArrayCallRegExp);
});
});
});
describe('Variant #2: function scope', () => {
@@ -244,6 +276,40 @@ describe('StringArrayScopeCallsWrapperTransformer', function () {
assert.match(obfuscatedCode, stringArrayCallRegExp);
});
});
describe('Variant #5: `identifiersPrefix` option is set', () => {
const stringArrayCallRegExp: RegExp = new RegExp(
'function test *\\( *\\) *{' +
'const f *= *foo_b;' +
'const g *= *foo_b;' +
'const a *= *[f|g]\\(0x3\\);' +
'const b *= *[f|g]\\(0x4\\);' +
'const c *= *[f|g]\\(0x5\\);' +
'}'
);
let obfuscatedCode: string;
before(() => {
const code: string = readFileAsString(__dirname + '/fixtures/wrappers-count-const.js');
obfuscatedCode = JavaScriptObfuscator.obfuscate(
code,
{
...NO_ADDITIONAL_NODES_PRESET,
identifierNamesGenerator: IdentifierNamesGenerator.MangledIdentifierNamesGenerator,
identifiersPrefix: 'foo_',
stringArray: true,
stringArrayThreshold: 1,
stringArrayWrappersCount: 2
}
).getObfuscatedCode();
});
it('should add scope calls wrappers', () => {
assert.match(obfuscatedCode, stringArrayCallRegExp);
});
});
});
describe('Variant #3: prohibited scopes', () => {
yarn.lock
+4 -4
View File
@@ -1910,10 +1910,10 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
eslint@7.13.0:
version "7.13.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da"
integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==
eslint@7.14.0:
version "7.14.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
dependencies:
"@babel/code-frame" "^7.0.0"
"@eslint/eslintrc" "^0.2.1"