Skip to content

Reverted TaggedTemplateLiteral obfuscation #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sanex3339 merged 1 commit into from
Aug 18, 2020
Merged

Reverted TaggedTemplateLiteral obfuscation #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Change Log
v1.11.0
---
* Improved rename of `deadCodeInjection` dead code identifiers. Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/708
* **Reverted** `TaggedTemplateLiteral` obfuscation. https://github.com/javascript-obfuscator/javascript-obfuscator/issues/716

v1.10.2
---
Expand Down
14 changes: 7 additions & 7 deletions dist/index.browser.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.cli.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 3 additions & 30 deletions src/node-transformers/converting-transformers/TemplateLiteralTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,45 +66,18 @@ export class TemplateLiteralTransformer extends AbstractNodeTransformer {
*/
public transformNode (templateLiteralNode: ESTree.TemplateLiteral, parentNode: ESTree.Node): ESTree.Node {
if (NodeGuards.isTaggedTemplateExpressionNode(parentNode)) {
return this.transformTaggedTemplateLiteralNodeNode(templateLiteralNode, parentNode);
} else {
return this.transformTemplateLiteralNodeNode(templateLiteralNode, parentNode);
return templateLiteralNode;
}
}

/**
* @param {ESTree.TemplateLiteral} templateLiteralNode
* @param {ESTree.Node} parentNode
* @returns {ESTree.Node}
*/
private transformTaggedTemplateLiteralNodeNode (templateLiteralNode: ESTree.TemplateLiteral, parentNode: ESTree.Node): ESTree.Node {
return NodeFactory.templateLiteral(
[this.transformTemplateLiteralNodeNode(templateLiteralNode, parentNode)],
[
NodeFactory.templateElement(
{
raw: '',
cooked: ''
},
false
),
NodeFactory.templateElement(
{
raw: '',
cooked: ''
},
true
)
]
);
return this.transformTemplateLiteralNode(templateLiteralNode, parentNode);
}

/**
* @param {ESTree.TemplateLiteral} templateLiteralNode
* @param {ESTree.Node} parentNode
* @returns {ESTree.Expression}
*/
private transformTemplateLiteralNodeNode (templateLiteralNode: ESTree.TemplateLiteral, parentNode: ESTree.Node): ESTree.Expression {
private transformTemplateLiteralNode (templateLiteralNode: ESTree.TemplateLiteral, parentNode: ESTree.Node): ESTree.Expression {
const templateLiteralExpressions: ESTree.Expression[] = templateLiteralNode.expressions;

let nodes: ESTree.Expression[] = [];
Expand Down
4 changes: 2 additions & 2 deletions ...s/converting-transformers/template-literal-transformer/TemplateLiteralTransformer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ describe('TemplateLiteralTransformer', () => {
});

describe('Variant #6: tagged template literal', () => {
it('shouldn transform es6 tagged template literal to es5', () => {
it('shouldn\'t transform es6 tagged template literal to es5', () => {
const code: string = readFileAsString(__dirname + '/fixtures/tagged-template-literal.js');

obfuscatedCode = JavaScriptObfuscator.obfuscate(
Expand All @@ -162,7 +162,7 @@ describe('TemplateLiteralTransformer', () => {

assert.match(
obfuscatedCode,
/tag`\${'foo\\x20' *\+ *\(0x1 *\+ *0x1\) *\+ *'\\x20bar'}`;/
/tag`foo *\${0x1 *\+ *0x1} *bar`;/
);
});
});
Expand Down