mirror of
https://github.com/javascript-obfuscator/javascript-obfuscator
synced 2026-08-09 12:42:29 +00:00
Fixed errors related to identifiers. Changed self defending helper
This commit is contained in:
+40
-28
@@ -1,5 +1,4 @@
|
||||
import { assert } from 'chai';
|
||||
import { spawn, Thread, Worker } from 'threads/dist';
|
||||
|
||||
import { readFileAsString } from '../../../../helpers/readFileAsString';
|
||||
|
||||
@@ -8,24 +7,13 @@ import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/N
|
||||
import { IdentifierNamesGenerator } from '../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
|
||||
import { ObfuscationTarget } from '../../../../../src/enums/ObfuscationTarget';
|
||||
|
||||
import { evaluateInWorker } from '../../../../helpers/evaluateInWorker';
|
||||
|
||||
import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
|
||||
|
||||
async function spawnThread(obfuscatedCode: string, threadCallback: Function, timeoutCallback: Function): Promise<void> {
|
||||
const evaluationWorker = await spawn(new Worker('./workers/evaluation-worker'));
|
||||
|
||||
const timeout = setTimeout(() => {
|
||||
Thread.terminate(evaluationWorker);
|
||||
timeoutCallback();
|
||||
}, 1500);
|
||||
|
||||
const result: string = await evaluationWorker.evaluate(obfuscatedCode);
|
||||
|
||||
clearTimeout(timeout);
|
||||
Thread.terminate(evaluationWorker);
|
||||
threadCallback(result);
|
||||
}
|
||||
|
||||
describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
const evaluationTimeout: number = 1500;
|
||||
|
||||
this.timeout(10000);
|
||||
|
||||
describe('Variant #1: correctly obfuscate code with `HexadecimalIdentifierNamesGenerator``', () => {
|
||||
@@ -46,7 +34,7 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
spawnThread(
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
@@ -54,7 +42,11 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
@@ -81,7 +73,7 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
spawnThread(
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
@@ -89,7 +81,11 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
@@ -117,7 +113,7 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
spawnThread(
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
@@ -125,7 +121,11 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
@@ -152,7 +152,7 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
spawnThread(
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
@@ -160,7 +160,11 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
@@ -187,7 +191,7 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
).getObfuscatedCode();
|
||||
obfuscatedCode = obfuscatedCode.replace(/\+\+ *_0x([a-f0-9]){4,6}/, '');
|
||||
|
||||
spawnThread(
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
@@ -195,7 +199,11 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
@@ -221,7 +229,7 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
spawnThread(
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
@@ -229,7 +237,11 @@ describe('DebugProtectionFunctionCallTemplate', function () {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
const expose = require('threads/worker').expose;
|
||||
|
||||
expose({
|
||||
evaluate: (obfuscatedCode) => {
|
||||
return eval(obfuscatedCode);
|
||||
}
|
||||
});
|
||||
+180
@@ -0,0 +1,180 @@
|
||||
import { assert } from 'chai';
|
||||
|
||||
import { readFileAsString } from '../../../../helpers/readFileAsString';
|
||||
|
||||
import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
|
||||
|
||||
import { IdentifierNamesGenerator } from '../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
|
||||
|
||||
import { evaluateInWorker } from '../../../../helpers/evaluateInWorker';
|
||||
|
||||
import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
|
||||
|
||||
describe('SelfDefendingTemplate', function () {
|
||||
const evaluationTimeout: number = 3500;
|
||||
|
||||
this.timeout(10000);
|
||||
|
||||
describe('Variant #1: correctly obfuscate code with `HexadecimalIdentifierNamesGenerator``', () => {
|
||||
const expectedEvaluationResult: number = 1;
|
||||
|
||||
let obfuscatedCode: string,
|
||||
evaluationResult: number = 0;
|
||||
|
||||
beforeEach((done) => {
|
||||
const code: string = readFileAsString(__dirname + '/fixtures/input.js');
|
||||
|
||||
obfuscatedCode = JavaScriptObfuscator.obfuscate(
|
||||
code,
|
||||
{
|
||||
...NO_ADDITIONAL_NODES_PRESET,
|
||||
selfDefending: true,
|
||||
identifierNamesGenerator: IdentifierNamesGenerator.HexadecimalIdentifierNamesGenerator
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
it('should correctly evaluate code with enabled self defending', () => {
|
||||
assert.equal(evaluationResult, expectedEvaluationResult);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Variant #2: correctly obfuscate code with `MangledIdentifierNamesGenerator` option', () => {
|
||||
const expectedEvaluationResult: number = 1;
|
||||
|
||||
let obfuscatedCode: string,
|
||||
evaluationResult: number = 0;
|
||||
|
||||
beforeEach((done) => {
|
||||
const code: string = readFileAsString(__dirname + '/fixtures/input.js');
|
||||
|
||||
obfuscatedCode = JavaScriptObfuscator.obfuscate(
|
||||
code,
|
||||
{
|
||||
...NO_ADDITIONAL_NODES_PRESET,
|
||||
selfDefending: true,
|
||||
identifierNamesGenerator: IdentifierNamesGenerator.MangledIdentifierNamesGenerator
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
it('should correctly evaluate code with enabled self defending', () => {
|
||||
assert.equal(evaluationResult, expectedEvaluationResult);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Variant #3: correctly obfuscate code with `DictionaryIdentifierNamesGenerator` option', () => {
|
||||
const expectedEvaluationResult: number = 1;
|
||||
|
||||
let obfuscatedCode: string,
|
||||
evaluationResult: number = 0;
|
||||
|
||||
beforeEach((done) => {
|
||||
const code: string = readFileAsString(__dirname + '/fixtures/input.js');
|
||||
|
||||
obfuscatedCode = JavaScriptObfuscator.obfuscate(
|
||||
code,
|
||||
{
|
||||
...NO_ADDITIONAL_NODES_PRESET,
|
||||
selfDefending: true,
|
||||
identifierNamesGenerator: IdentifierNamesGenerator.DictionaryIdentifierNamesGenerator,
|
||||
identifiersDictionary: ['foo', 'bar', 'baz', 'bark', 'hawk', 'eagle']
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
it('should correctly evaluate code with enabled self defending', () => {
|
||||
assert.equal(evaluationResult, expectedEvaluationResult);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Variant #4: obfuscated code with beautified self defending code', () => {
|
||||
const expectedEvaluationResult: number = 0;
|
||||
|
||||
let obfuscatedCode: string,
|
||||
evaluationResult: number = 0;
|
||||
|
||||
beforeEach((done) => {
|
||||
const code: string = readFileAsString(__dirname + '/fixtures/input.js');
|
||||
|
||||
obfuscatedCode = JavaScriptObfuscator.obfuscate(
|
||||
code,
|
||||
{
|
||||
...NO_ADDITIONAL_NODES_PRESET,
|
||||
selfDefending: true
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
obfuscatedCode = obfuscatedCode
|
||||
.replace(/function\(\){/g, 'function () {')
|
||||
.replace(/=/g, ' = ')
|
||||
.replace(/,/g, ', ')
|
||||
.replace(/;/g, '; ')
|
||||
.replace(/{/g, '{\n')
|
||||
.replace(/}/g, '}\n');
|
||||
|
||||
evaluateInWorker(
|
||||
obfuscatedCode,
|
||||
(response: number) => {
|
||||
evaluationResult = response;
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
},
|
||||
evaluationTimeout
|
||||
);
|
||||
});
|
||||
|
||||
it('should enter code in infinity loop', () => {
|
||||
assert.equal(evaluationResult, expectedEvaluationResult);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,3 @@
|
||||
(function () {
|
||||
return 1;
|
||||
})();
|
||||
@@ -844,7 +844,6 @@ describe('JavaScriptObfuscator', () => {
|
||||
stringArrayEncoding: StringArrayEncoding.Rc4
|
||||
}
|
||||
).getObfuscatedCode();
|
||||
|
||||
});
|
||||
|
||||
it('does not break on run', () => {
|
||||
|
||||
Reference in New Issue
Block a user