From a9c08c44f1e068e338fa86f78b795869441821ff Mon Sep 17 00:00:00 2001 From: sanex3339 Date: Sun, 18 Dec 2016 20:50:59 +0300 Subject: [PATCH] added missing lines in readme --- README.md | 2 + dist/index.js | 156 ++++++++++++++++++++++++-------------------------- 2 files changed, 77 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index d02e70ca..ac44ad20 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,7 @@ Following options available for the JS Obfuscator: { compact: true, controlFlowFlattening: false, + controlFlowFlatteningThreshold: 0.75, debugProtection: false, debugProtectionInterval: false, disableConsoleOutput: true, @@ -146,6 +147,7 @@ Following options available for the JS Obfuscator: --compact --controlFlowFlattening + --controlFlowFlatteningThreshold --debugProtection --debugProtectionInterval --disableConsoleOutput diff --git a/dist/index.js b/dist/index.js index 55e5284a..9af7e0d0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -88,7 +88,7 @@ module.exports = /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 144); +/******/ return __webpack_require__(__webpack_require__.s = 142); /******/ }) /************************************************************************/ /******/ ([ @@ -122,7 +122,7 @@ module.exports = require("tslib"); "use strict"; "use strict"; -var _symbol = __webpack_require__(134); +var _symbol = __webpack_require__(133); var _symbol2 = _interopRequireDefault(_symbol); @@ -263,11 +263,11 @@ exports.RandomGeneratorUtils = RandomGeneratorUtils; "use strict"; "use strict"; -var _defineProperty = __webpack_require__(132); +var _defineProperty = __webpack_require__(131); var _defineProperty2 = _interopRequireDefault(_defineProperty); -var _getOwnPropertyDescriptor = __webpack_require__(133); +var _getOwnPropertyDescriptor = __webpack_require__(132); var _getOwnPropertyDescriptor2 = _interopRequireDefault(_getOwnPropertyDescriptor); @@ -472,7 +472,7 @@ exports.Node = Node; "use strict"; "use strict"; -var _from = __webpack_require__(26); +var _from = __webpack_require__(33); var _from2 = _interopRequireDefault(_from); @@ -581,6 +581,11 @@ var Utils = function () { value: function strEnumify(obj) { return obj; } + }, { + key: "stringRotate", + value: function stringRotate(string, times) { + return Utils.arrayRotate((0, _from2.default)(string), times).join(''); + } }, { key: "stringToJSFuck", value: function stringToJSFuck(string) { @@ -695,7 +700,7 @@ var _createClass3 = _interopRequireDefault(_createClass2); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var escodegen = __webpack_require__(27); +var escodegen = __webpack_require__(26); var esprima = __webpack_require__(48); var estraverse = __webpack_require__(13); var NodeType_1 = __webpack_require__(17); @@ -1014,9 +1019,9 @@ var _createClass3 = _interopRequireDefault(_createClass2); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -__webpack_require__(142); +__webpack_require__(141); if (!global._babelPolyfill) { - __webpack_require__(131); + __webpack_require__(130); } var ServiceIdentifiers_1 = __webpack_require__(4); var chance_1 = __webpack_require__(47); @@ -1244,16 +1249,10 @@ exports.AbstractCustomNodeGroup = AbstractCustomNodeGroup; /* 26 */ /***/ function(module, exports) { -module.exports = require("babel-runtime/core-js/array/from"); - -/***/ }, -/* 27 */ -/***/ function(module, exports) { - module.exports = require("escodegen"); /***/ }, -/* 28 */ +/* 27 */ /***/ function(module, exports) { "use strict"; @@ -1265,7 +1264,7 @@ exports.SourceMapMode = { }; /***/ }, -/* 29 */ +/* 28 */ /***/ function(module, exports, __webpack_require__) { "use strict"; @@ -1289,7 +1288,7 @@ AbstractReplacer = tslib_1.__decorate([inversify_1.injectable(), tslib_1.__param exports.AbstractReplacer = AbstractReplacer; /***/ }, -/* 30 */ +/* 29 */ /***/ function(module, exports, __webpack_require__) { "use strict"; @@ -1301,7 +1300,7 @@ var _freeze2 = _interopRequireDefault(_freeze); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var SourceMapMode_1 = __webpack_require__(28); +var SourceMapMode_1 = __webpack_require__(27); exports.NO_CUSTOM_NODES_PRESET = (0, _freeze2.default)({ compact: true, controlFlowFlattening: false, @@ -1325,7 +1324,7 @@ exports.NO_CUSTOM_NODES_PRESET = (0, _freeze2.default)({ }); /***/ }, -/* 31 */ +/* 30 */ /***/ function(module, exports) { "use strict"; @@ -1337,7 +1336,7 @@ exports.StringArrayEncoding = { }; /***/ }, -/* 32 */ +/* 31 */ /***/ function(module, exports, __webpack_require__) { "use strict"; @@ -1358,7 +1357,7 @@ AbstractCalleeDataExtractor = tslib_1.__decorate([inversify_1.injectable(), tsli exports.AbstractCalleeDataExtractor = AbstractCalleeDataExtractor; /***/ }, -/* 33 */ +/* 32 */ /***/ function(module, exports, __webpack_require__) { "use strict"; @@ -1462,6 +1461,12 @@ var CryptUtils = function () { exports.CryptUtils = CryptUtils; +/***/ }, +/* 33 */ +/***/ function(module, exports) { + +module.exports = require("babel-runtime/core-js/array/from"); + /***/ }, /* 34 */ /***/ function(module, exports) { @@ -1620,7 +1625,7 @@ var _freeze2 = _interopRequireDefault(_freeze); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var SourceMapMode_1 = __webpack_require__(28); +var SourceMapMode_1 = __webpack_require__(27); exports.DEFAULT_PRESET = (0, _freeze2.default)({ compact: true, controlFlowFlattening: false, @@ -1658,7 +1663,7 @@ var _map = __webpack_require__(12); var _map2 = _interopRequireDefault(_map); -var _from = __webpack_require__(26); +var _from = __webpack_require__(33); var _from2 = _interopRequireDefault(_from); @@ -1803,7 +1808,7 @@ var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); var esprima = __webpack_require__(48); -var escodegen = __webpack_require__(27); +var escodegen = __webpack_require__(26); var JavaScriptObfuscatorInternal = JavaScriptObfuscatorInternal_1 = function () { function JavaScriptObfuscatorInternal(obfuscator, sourceMapCorrector, options) { (0, _classCallCheck3.default)(this, JavaScriptObfuscatorInternal); @@ -1920,7 +1925,7 @@ var _map = __webpack_require__(12); var _map2 = _interopRequireDefault(_map); -var _defineProperty2 = __webpack_require__(135); +var _defineProperty2 = __webpack_require__(134); var _defineProperty3 = _interopRequireDefault(_defineProperty2); @@ -2016,8 +2021,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var SourceMapMode_1 = __webpack_require__(28); -var CryptUtils_1 = __webpack_require__(33); +var SourceMapMode_1 = __webpack_require__(27); +var CryptUtils_1 = __webpack_require__(32); var SourceMapCorrector = function () { function SourceMapCorrector(obfuscationResultFactory, options) { (0, _classCallCheck3.default)(this, SourceMapCorrector); @@ -2076,8 +2081,8 @@ var _createClass3 = _interopRequireDefault(_createClass2); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var fs = __webpack_require__(140); -var mkdirp = __webpack_require__(141); +var fs = __webpack_require__(139); +var mkdirp = __webpack_require__(140); var path = __webpack_require__(50); var CLIUtils = function () { @@ -2177,10 +2182,10 @@ var _createClass3 = _interopRequireDefault(_createClass2); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var tslib_1 = __webpack_require__(3); -var commander = __webpack_require__(138); +var commander = __webpack_require__(137); var path = __webpack_require__(50); -var SourceMapMode_1 = __webpack_require__(28); -var StringArrayEncoding_1 = __webpack_require__(31); +var SourceMapMode_1 = __webpack_require__(27); +var StringArrayEncoding_1 = __webpack_require__(30); var Default_1 = __webpack_require__(42); var CLIUtils_1 = __webpack_require__(55); var JavaScriptObfuscator_1 = __webpack_require__(23); @@ -3326,7 +3331,7 @@ var format = __webpack_require__(16); var Initializable_1 = __webpack_require__(9); var DomainLockNodeTemplate_1 = __webpack_require__(121); var AbstractCustomNode_1 = __webpack_require__(14); -var CryptUtils_1 = __webpack_require__(33); +var CryptUtils_1 = __webpack_require__(32); var RandomGeneratorUtils_1 = __webpack_require__(8); var DomainLockNode = function (_AbstractCustomNode_) { (0, _inherits3.default)(DomainLockNode, _AbstractCustomNode_); @@ -3494,7 +3499,7 @@ var format = __webpack_require__(16); var ObfuscationEvents_1 = __webpack_require__(21); var Initializable_1 = __webpack_require__(9); var SingleNodeCallControllerTemplate_1 = __webpack_require__(113); -var NoCustomNodes_1 = __webpack_require__(30); +var NoCustomNodes_1 = __webpack_require__(29); var AbstractCustomNode_1 = __webpack_require__(14); var JavaScriptObfuscator_1 = __webpack_require__(23); var NodeCallsControllerFunctionNode = function (_AbstractCustomNode_) { @@ -3565,7 +3570,7 @@ var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); var format = __webpack_require__(16); var Initializable_1 = __webpack_require__(9); -var NoCustomNodes_1 = __webpack_require__(30); +var NoCustomNodes_1 = __webpack_require__(29); var SelfDefendingTemplate_1 = __webpack_require__(122); var AbstractCustomNode_1 = __webpack_require__(14); var JavaScriptObfuscator_1 = __webpack_require__(23); @@ -3726,9 +3731,9 @@ var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); var format = __webpack_require__(16); -var StringArrayEncoding_1 = __webpack_require__(31); +var StringArrayEncoding_1 = __webpack_require__(30); var Initializable_1 = __webpack_require__(9); -var NoCustomNodes_1 = __webpack_require__(30); +var NoCustomNodes_1 = __webpack_require__(29); var AtobTemplate_1 = __webpack_require__(111); var Rc4Template_1 = __webpack_require__(112); var SelfDefendingTemplate_1 = __webpack_require__(123); @@ -3913,7 +3918,7 @@ var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); var format = __webpack_require__(16); var Initializable_1 = __webpack_require__(9); -var NoCustomNodes_1 = __webpack_require__(30); +var NoCustomNodes_1 = __webpack_require__(29); var SelfDefendingTemplate_1 = __webpack_require__(128); var StringArrayRotateFunctionTemplate_1 = __webpack_require__(129); var AbstractCustomNode_1 = __webpack_require__(14); @@ -3973,10 +3978,6 @@ exports.StringArrayRotateFunctionNode = StringArrayRotateFunctionNode; "use strict"; "use strict"; -var _from = __webpack_require__(26); - -var _from2 = _interopRequireDefault(_from); - var _map = __webpack_require__(12); var _map2 = _interopRequireDefault(_map); @@ -4055,9 +4056,8 @@ var StringArrayCustomNodeGroup = function (_AbstractCustomNodeGr) { var stringArrayCallsWrapper = this.customNodeFactory(CustomNodes_1.CustomNodes.StringArrayCallsWrapper); var stringArrayRotateFunctionNode = this.customNodeFactory(CustomNodes_1.CustomNodes.StringArrayRotateFunctionNode); var stringArrayStorageId = this.stringArrayStorage.getStorageId(); - var reversedStorageId = (0, _from2.default)(stringArrayStorageId).reverse().join(''); var stringArrayName = "_" + Utils_1.Utils.hexadecimalPrefix + stringArrayStorageId; - var stringArrayCallsWrapperName = "_" + Utils_1.Utils.hexadecimalPrefix + reversedStorageId; + var stringArrayCallsWrapperName = "_" + Utils_1.Utils.hexadecimalPrefix + Utils_1.Utils.stringRotate(stringArrayStorageId, 2); var stringArrayRotateValue = void 0; if (this.options.rotateStringArray) { stringArrayRotateValue = RandomGeneratorUtils_1.RandomGeneratorUtils.getRandomInteger(100, 500); @@ -4121,7 +4121,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); -var events_1 = __webpack_require__(139); +var events_1 = __webpack_require__(138); inversify_1.decorate(inversify_1.injectable(), events_1.EventEmitter); var ObfuscationEventEmitter = function (_events_1$EventEmitte) { (0, _inherits3.default)(ObfuscationEventEmitter, _events_1$EventEmitte); @@ -4802,7 +4802,7 @@ exports.LabeledStatementObfuscator = LabeledStatementObfuscator; "use strict"; "use strict"; -var _typeof2 = __webpack_require__(136); +var _typeof2 = __webpack_require__(135); var _typeof3 = _interopRequireDefault(_typeof2); @@ -4831,7 +4831,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var escodegen = __webpack_require__(27); +var escodegen = __webpack_require__(26); var NodeObfuscatorsReplacers_1 = __webpack_require__(19); var AbstractNodeTransformer_1 = __webpack_require__(18); var Node_1 = __webpack_require__(10); @@ -4914,7 +4914,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var escodegen = __webpack_require__(27); +var escodegen = __webpack_require__(26); var estraverse = __webpack_require__(13); var NodeObfuscatorsReplacers_1 = __webpack_require__(19); var NodeType_1 = __webpack_require__(17); @@ -5098,7 +5098,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var escodegen = __webpack_require__(27); +var escodegen = __webpack_require__(26); var estraverse = __webpack_require__(13); var NodeType_1 = __webpack_require__(17); var AbstractNodeTransformer_1 = __webpack_require__(18); @@ -5294,7 +5294,7 @@ var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); var JSFuck_1 = __webpack_require__(37); -var AbstractReplacer_1 = __webpack_require__(29); +var AbstractReplacer_1 = __webpack_require__(28); var BooleanLiteralReplacer = function (_AbstractReplacer_1$A) { (0, _inherits3.default)(BooleanLiteralReplacer, _AbstractReplacer_1$A); @@ -5350,7 +5350,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var AbstractReplacer_1 = __webpack_require__(29); +var AbstractReplacer_1 = __webpack_require__(28); var RandomGeneratorUtils_1 = __webpack_require__(8); var IdentifierReplacer = function (_AbstractReplacer_1$A) { (0, _inherits3.default)(IdentifierReplacer, _AbstractReplacer_1$A); @@ -5425,7 +5425,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var AbstractReplacer_1 = __webpack_require__(29); +var AbstractReplacer_1 = __webpack_require__(28); var Utils_1 = __webpack_require__(11); var NumberLiteralReplacer = function (_AbstractReplacer_1$A) { (0, _inherits3.default)(NumberLiteralReplacer, _AbstractReplacer_1$A); @@ -5456,10 +5456,6 @@ exports.NumberLiteralReplacer = NumberLiteralReplacer; "use strict"; "use strict"; -var _from = __webpack_require__(26); - -var _from2 = _interopRequireDefault(_from); - var _getPrototypeOf = __webpack_require__(5); var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf); @@ -5485,9 +5481,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var ServiceIdentifiers_1 = __webpack_require__(4); -var StringArrayEncoding_1 = __webpack_require__(31); -var AbstractReplacer_1 = __webpack_require__(29); -var CryptUtils_1 = __webpack_require__(33); +var StringArrayEncoding_1 = __webpack_require__(30); +var AbstractReplacer_1 = __webpack_require__(28); +var CryptUtils_1 = __webpack_require__(32); var RandomGeneratorUtils_1 = __webpack_require__(8); var Utils_1 = __webpack_require__(11); var StringLiteralReplacer = StringLiteralReplacer_1 = function (_AbstractReplacer_1$A) { @@ -5536,8 +5532,8 @@ var StringLiteralReplacer = StringLiteralReplacer_1 = function (_AbstractReplace indexOfValue = this.stringArrayStorage.getLength(); this.stringArrayStorage.set(null, value); } - var reversedStringArrayId = (0, _from2.default)(this.stringArrayStorage.getStorageId()).reverse().join(''); - var stringArrayStorageCallsWrapperName = "_" + Utils_1.Utils.hexadecimalPrefix + reversedStringArrayId; + var rotatedStringArrayStorageId = Utils_1.Utils.stringRotate(this.stringArrayStorage.getStorageId(), 2); + var stringArrayStorageCallsWrapperName = "_" + Utils_1.Utils.hexadecimalPrefix + rotatedStringArrayStorageId; var hexadecimalIndex = "" + Utils_1.Utils.hexadecimalPrefix + Utils_1.Utils.decToHex(indexOfValue); if (this.options.stringArrayEncoding === StringArrayEncoding_1.StringArrayEncoding.rc4) { return stringArrayStorageCallsWrapperName + "('" + hexadecimalIndex + "', '" + Utils_1.Utils.stringToUnicodeEscapeSequence(rc4Key) + "')"; @@ -5574,7 +5570,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); -var class_validator_1 = __webpack_require__(137); +var class_validator_1 = __webpack_require__(136); var Default_1 = __webpack_require__(42); var OptionsNormalizer_1 = __webpack_require__(101); var ValidationErrorsFormatter_1 = __webpack_require__(102); @@ -6022,7 +6018,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var estraverse = __webpack_require__(13); -var AbstractCalleeDataExtractor_1 = __webpack_require__(32); +var AbstractCalleeDataExtractor_1 = __webpack_require__(31); var Node_1 = __webpack_require__(10); var NodeUtils_1 = __webpack_require__(15); var FunctionDeclarationCalleeDataExtractor = function (_AbstractCalleeDataEx) { @@ -6100,7 +6096,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var tslib_1 = __webpack_require__(3); var inversify_1 = __webpack_require__(2); var estraverse = __webpack_require__(13); -var AbstractCalleeDataExtractor_1 = __webpack_require__(32); +var AbstractCalleeDataExtractor_1 = __webpack_require__(31); var Node_1 = __webpack_require__(10); var NodeUtils_1 = __webpack_require__(15); var FunctionExpressionCalleeDataExtractor = function (_AbstractCalleeDataEx) { @@ -6187,7 +6183,7 @@ var inversify_1 = __webpack_require__(2); var estraverse = __webpack_require__(13); var Node_1 = __webpack_require__(10); var NodeUtils_1 = __webpack_require__(15); -var AbstractCalleeDataExtractor_1 = __webpack_require__(32); +var AbstractCalleeDataExtractor_1 = __webpack_require__(31); var ObjectExpressionCalleeDataExtractor = function (_AbstractCalleeDataEx) { (0, _inherits3.default)(ObjectExpressionCalleeDataExtractor, _AbstractCalleeDataEx); @@ -6403,7 +6399,7 @@ var _slicedToArray2 = __webpack_require__(35); var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); -var _from = __webpack_require__(26); +var _from = __webpack_require__(33); var _from2 = _interopRequireDefault(_from); @@ -6847,81 +6843,79 @@ function StringArrayRotateFunctionTemplate() { exports.StringArrayRotateFunctionTemplate = StringArrayRotateFunctionTemplate; /***/ }, -/* 130 */, -/* 131 */ +/* 130 */ /***/ function(module, exports) { module.exports = require("babel-polyfill"); /***/ }, -/* 132 */ +/* 131 */ /***/ function(module, exports) { module.exports = require("babel-runtime/core-js/object/define-property"); /***/ }, -/* 133 */ +/* 132 */ /***/ function(module, exports) { module.exports = require("babel-runtime/core-js/object/get-own-property-descriptor"); /***/ }, -/* 134 */ +/* 133 */ /***/ function(module, exports) { module.exports = require("babel-runtime/core-js/symbol"); /***/ }, -/* 135 */ +/* 134 */ /***/ function(module, exports) { module.exports = require("babel-runtime/helpers/defineProperty"); /***/ }, -/* 136 */ +/* 135 */ /***/ function(module, exports) { module.exports = require("babel-runtime/helpers/typeof"); /***/ }, -/* 137 */ +/* 136 */ /***/ function(module, exports) { module.exports = require("class-validator"); /***/ }, -/* 138 */ +/* 137 */ /***/ function(module, exports) { module.exports = require("commander"); /***/ }, -/* 139 */ +/* 138 */ /***/ function(module, exports) { module.exports = require("events"); /***/ }, -/* 140 */ +/* 139 */ /***/ function(module, exports) { module.exports = require("fs"); /***/ }, -/* 141 */ +/* 140 */ /***/ function(module, exports) { module.exports = require("mkdirp"); /***/ }, -/* 142 */ +/* 141 */ /***/ function(module, exports) { module.exports = require("reflect-metadata"); /***/ }, -/* 143 */, -/* 144 */ +/* 142 */ /***/ function(module, exports, __webpack_require__) { "use strict";