Updated to use the javascript-obfuscator@0.14.2 which includes two new options: 'identifiersPrefix' and 'transformObjectKeys'.

slig · slig · commit 9ddfb09271ab · 2018-02-17T16:25:49.000-02:00
diff --git a/App/actions/index.js b/App/actions/index.js
@@ -102,3 +102,8 @@ export const setIdentifierNamesGenerator = (identifierNamesGenerator) => ({
   'type': types.SET_IDENTIFIER_NAMES_GENERATOR,
   identifierNamesGenerator
 });
+
+export const setIdentifiersPrefix = (identifiersPrefix) => ({
+  'type': types.SET_IDENTIFIERS_PREFIX,
+  identifiersPrefix
+});
diff --git a/App/constants/ActionTypes.js b/App/constants/ActionTypes.js
@@ -43,3 +43,7 @@ export const TOGGLE_RENAME_GLOBALS = 'TOGGLE_RENAME_GLOBALS'
 export const SET_TARGET = 'SET_TARGET'
 
 export const SET_IDENTIFIER_NAMES_GENERATOR = 'SET_IDENTIFER_NAMES_GENERATOR'
+
+export const SET_IDENTIFIERS_PREFIX = 'SET_IDENTIFIERS_PREFIX'
+
+export const TOGGLE_TRANSFORM_OBJECT_KEYS = 'TOGGLE_TRANSFORM_OBJECT_KEYS'
diff --git a/App/containers/OptionsContainer.js b/App/containers/OptionsContainer.js
@@ -62,6 +62,12 @@ const Options = ({dispatch, options}) =>
             onChange={(event, {value}) => dispatch(actions.setIdentifierNamesGenerator(value)) }
             options={IDENTIFIER_NAMES_GENERATOR_OPTIONS} />
 
+          <Form.Input
+            label='Identifiers Prefix'
+            onBlur={(event) => dispatch(actions.setIdentifiersPrefix(event.target.value)) }
+            defaultValue={options.identifiersPrefix}
+            placeholder='' />
+
           <Form.Checkbox
             label='Rename Globals'
             checked={options.renameGlobals}
@@ -145,6 +151,13 @@ const Options = ({dispatch, options}) =>
 
           <Divider />
 
+          <Form.Checkbox
+            label='Transform Object Keys'
+            checked={options.transformObjectKeys}
+            onChange={() => dispatch(actions.toggleOption(types.TOGGLE_TRANSFORM_OBJECT_KEYS)) } />
+
+          <Divider />
+
           <Form.Checkbox
             label='Unicode Escape Sequence'
             checked={options.unicodeEscapeSequence}
diff --git a/App/reducers/options.js b/App/reducers/options.js
@@ -45,6 +45,9 @@ const initialState = {
   target: 'browser',
 
   identifierNamesGenerator: 'hexadecimal',
+  identifiersPrefix: '',
+
+  transformObjectKeys: false,
 
 }
 
@@ -247,6 +250,18 @@ export const options = (state = initialState, action) => {
         identifierNamesGenerator: action.identifierNamesGenerator
       }
 
+    case types.SET_IDENTIFIERS_PREFIX:
+      return {
+        ...state,
+        identifiersPrefix: action.identifiersPrefix
+      }
+
+    case types.TOGGLE_TRANSFORM_OBJECT_KEYS:
+      return {
+        ...state,
+        transformObjectKeys: !state.transformObjectKeys
+      }
+
     default:
       return state
   }
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "extract-text-webpack-plugin": "^2.0.0-beta",
     "graceful-fs": "^4.1.9",
     "inert": "^4.0.2",
-    "javascript-obfuscator": "^0.13.0",
+    "javascript-obfuscator": "^0.14.2",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "react": "^15.3.1",
diff --git a/templates/index.html b/templates/index.html
@@ -94,6 +94,14 @@ <h3>Sounds great!</h3>
                 </td>
               </tr>
 
+              <tr>
+                <td class="collapsing">Identifiers Prefix</td>
+                <td>
+                  <p>This options makes all obfuscated identifiers have a specific prefix.</p>
+                  <p>Use this option when obfuscating multiple files that are loaded on the same page. This option helps to avoid conflicts between global identifiers of these files. Use a different prefix for each file.</p>
+                </td>
+              </tr>
+
               <tr>
                 <td class="collapsing">Rename Globals</td>
                 <td>
@@ -150,7 +158,7 @@ <h3>Sounds great!</h3>
                   </div>
 
                   <p>
-                    This feature adds random blocks of dead code (i.e: code that won't be executed) to the obfuscated output, making it harder to be reverserd-engineered. See the docs on <a href="https://github.com/javascript-obfuscator/javascript-obfuscator#deadcodeinjection" target="_new">JavaScript's obfuscator GH page</a> for an example of how this feature works.
+                    This feature adds random blocks of dead code (i.e: code that won't be executed) to the obfuscated output, making it harder to be reverserd-engineered. See the docs on <a href="https://github.com/javascript-obfuscator/javascript-obfuscator#deadcodeinjection" target="_new">JavaScript Obfuscator's GH page</a> for an example of how this feature works.
                   </p>
 
                   <table class="ui definition table">
@@ -216,6 +224,16 @@ <h3>Sounds great!</h3>
                 </td>
               </tr>
 
+              <tr>
+                <td class="collapsing">Transform Object Keys</td>
+                <td>
+                  <p>Transforms (obfuscates) object keys.</p>
+                  <p>For instance, this code <code>var a = {enabled: true};</code> when obfuscated with this option will hide the <code>enabled</code> object key: <code>var a = {}; a[_0x2ae0[('0x0')] = true;</code>.</p>
+                  <p>See the <a href="https://github.com/javascript-obfuscator/javascript-obfuscator#transformobjectkeys" target="_new">official documentation of the JavaScript Obfuscator on GitHub</a> for a full example.</p>
+                  <p><small>ideally used with the <strong>String Array</strong> setting.</small></p>
+                </td>
+              </tr>
+
               <tr>
                 <td class="collapsing">Escape Unicode Sequence</td>
                 <td>
diff --git a/yarn.lock b/yarn.lock
@@ -81,7 +81,7 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0:
+ansi-styles@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
@@ -1135,17 +1135,17 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+chalk@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
   dependencies:
-    ansi-styles "^3.1.0"
+    ansi-styles "^3.2.0"
     escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
+    supports-color "^5.2.0"
 
-chance@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.12.tgz#6764c9cb7b4f34856fb780d07f0e17a6601c6c08"
+chance@1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.13.tgz#666bec2db42b3084456a3e4f4c28a82db5ccb7e6"
 
 charenc@~0.0.1:
   version "0.0.2"
@@ -1182,11 +1182,11 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
-class-validator@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.7.3.tgz#3c2821b8cf35fd8d5f4fcb8063bc57fb50049e7e"
+class-validator@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.8.1.tgz#f5efd5c613927e3c2f68692e8f14d53a2644fb2f"
   dependencies:
-    validator "^7.0.0"
+    validator "9.2.0"
 
 classnames@^2.1.5, classnames@^2.2.3, classnames@^2.2.5:
   version "2.2.5"
@@ -1298,9 +1298,9 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.12.2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+commander@2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
 commander@^2.9.0:
   version "2.9.0"
@@ -1709,9 +1709,9 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen-wallaby@1.6.15:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/escodegen-wallaby/-/escodegen-wallaby-1.6.15.tgz#9d5ef67dd4d8c7c8a58aff1e4edd63512566ba9f"
+escodegen-wallaby@1.6.17:
+  version "1.6.17"
+  resolved "https://registry.yarnpkg.com/escodegen-wallaby/-/escodegen-wallaby-1.6.17.tgz#3e1f334884d4214c94309cf734ec7cfa0b3d438d"
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -2168,9 +2168,9 @@ has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
 has-unicode@^2.0.0:
   version "2.0.1"
@@ -2367,9 +2367,9 @@ invariant@^2.0.0, invariant@^2.2.0:
   dependencies:
     loose-envify "^1.0.0"
 
-inversify@4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/inversify/-/inversify-4.8.0.tgz#750c3c204ee9fe9a7529062dc6196c69d05fee7e"
+inversify@^4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/inversify/-/inversify-4.10.0.tgz#06b97792e69220dd150b986cde9a445b3bcb9482"
 
 invert-kv@^1.0.0:
   version "1.0.0"
@@ -2551,26 +2551,27 @@ items@2.x.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.1.tgz#8bd16d9c83b19529de5aea321acaada78364a198"
 
-javascript-obfuscator@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/javascript-obfuscator/-/javascript-obfuscator-0.13.0.tgz#a6dadad98a602f9e0917ab42ec9f6e3f6def1da8"
+javascript-obfuscator@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/javascript-obfuscator/-/javascript-obfuscator-0.14.2.tgz#653066652e15427a3f2d804bd53fbfcabefbdd3b"
   dependencies:
-    chalk "2.3.0"
-    chance "1.0.12"
-    class-validator "0.7.3"
-    commander "2.12.2"
-    escodegen-wallaby "1.6.15"
+    chalk "2.3.1"
+    chance "1.0.13"
+    class-validator "0.8.1"
+    commander "2.14.1"
+    escodegen-wallaby "1.6.17"
     esprima "4.0.0"
     estraverse "4.2.0"
-    inversify "4.8.0"
+    inversify "^4.10.0"
+    js-string-escape "1.0.1"
     md5 "2.2.1"
     mkdirp "0.5.1"
     opencollective "1.0.3"
-    pjson "^1.0.9"
-    reflect-metadata "0.1.10"
-    source-map-support "0.5.0"
+    pjson "1.0.9"
+    reflect-metadata "0.1.12"
+    source-map-support "0.5.3"
     string-template "1.0.0"
-    tslib "1.8.1"
+    tslib "1.9.0"
 
 jodid25519@^1.0.0:
   version "1.0.2"
@@ -2596,6 +2597,10 @@ js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
+js-string-escape@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+
 js-tokens@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-1.0.3.tgz#14e56eb68c8f1a92c43d59f5014ec29dc20f2ae1"
@@ -3221,7 +3226,7 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pjson@^1.0.9:
+pjson@1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/pjson/-/pjson-1.0.9.tgz#8a9520ce76a4739f8fee91679dad6b065b1c7938"
 
@@ -3715,9 +3720,9 @@ redux@^3.6.0:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.2"
 
-reflect-metadata@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
+reflect-metadata@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
 
 regenerate@^1.2.1:
   version "1.3.1"
@@ -3980,9 +3985,9 @@ source-list-map@^0.1.4, source-list-map@~0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.6.tgz#e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f"
 
-source-map-support@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
+source-map-support@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
   dependencies:
     source-map "^0.6.0"
 
@@ -4123,11 +4128,11 @@ supports-color@^3.1.0, supports-color@^3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+supports-color@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
   dependencies:
-    has-flag "^2.0.0"
+    has-flag "^3.0.0"
 
 svgo@^0.7.0:
   version "0.7.1"
@@ -4219,9 +4224,9 @@ tryit@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.2.tgz#c196b0073e6b1c595d93c9c830855b7acc32a453"
 
-tslib@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
+tslib@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
 
 tty-browserify@0.0.0:
   version "0.0.0"
@@ -4336,9 +4341,9 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-validator@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-7.2.0.tgz#a63dcbaba51d4350bf8df20988e0d5a54d711791"
+validator@9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-9.2.0.tgz#ad216eed5f37cac31a6fe00ceab1f6b88bded03e"
 
 vary@~1.1.0:
   version "1.1.0"
