Merge pull request #61 from PropGit/Remove_Obfuscation

PropGit · web-flow · commit 3106e5ede9c5 · 2019-04-15T09:16:27.000-07:00
Remove obfuscation
diff --git a/LICENSE b/LICENSE
@@ -2,33 +2,33 @@
 ******** License for http.js ********
 *************************************
 
-// Copyright 2013 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright 2013 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of Google Inc. nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
@@ -45,6 +45,31 @@ See sha1.js file and license at http://www.apache.org/licenses/LICENSE-2.0
 *************************************
 
 All other project source code, unless indicated by the code itself, is
-copyright (c) Parallax Inc. and is proprietary.  See statement in the
-respective source code file(s).
+copyright (c) 2019 Parallax Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of Parallax Inc. nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
diff --git a/MakeRelease b/MakeRelease
@@ -1,38 +1,30 @@
 echo
-echo ---Making Obfuscated Chrome App release in ./release folder---
+echo ---Making Chrome App release in ./release folder---
 echo
-echo STEP 1 of 3: Clearing ./release folder
+echo STEP 1 of 2: Clearing ./release folder
 echo
 # Clear release folder
 rm -R release/*
 
-echo STEP 2 of 3: Generating obfuscated source - automatically creating ./release folder if needed
-#
-# Options Notes:
-#   disable-console-output - causes the Chrome App to fail to launch (on background.js) or refuse to evaluate statements (parser.js and presumably others).  It must be set 'false' to prevent this.
-#   rotate-string-array    - set to false on small files, true on large files.  This makes it harder to determine the order of strings, but on small files the inserted helper function can attact attention.
-#   string-array-encoding  - further obscures strings by base-64 (or rc4) encoding them, but slows down execution by up to 50%.  It also breaks the Chrome App when true; set to false.
-#
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   background.js  --output release/background.js  --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array false  --string-array-encoding false  --self-defending true
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   index.js       --output release/index.js       --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array true   --string-array-encoding false  --self-defending true
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   loader.js      --output release/loader.js      --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array true   --string-array-encoding false  --self-defending true
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   parser.js      --output release/parser.js      --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array false  --string-array-encoding false  --self-defending true
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   port.js        --output release/port.js        --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array false  --string-array-encoding false  --self-defending true
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   serial.js      --output release/serial.js      --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array true   --string-array-encoding false  --self-defending true
-./node_modules/javascript-obfuscator/bin/javascript-obfuscator   wx.js          --output release/wx.js          --disable-console-output false  --compact true  --identifier-names-generator hexadecimal  --identifiers-prefix ""  --string-array true  --rotate-string-array false  --string-array-encoding false  --self-defending true
-
 echo
-echo STEP 3 of 3: Copying static resources to ./release folder
+echo STEP 2 of 2: Copying static resources to ./release folder
 echo
 # Copy static resources
 cp -R assets          release/assets
+cp    background.js   release/
 cp    http.js         release/
 cp    index.css       release/
 cp    index.html      release/
+cp    index.js        release/
 cp    LICENSE         release/
+cp    loader.js       release/
 cp    manifest.json   release/
 cp    messages.js     release/
+cp    parser.js       release/
+cp    port.js         release/
+cp    serial.js       release/
 cp    sha1.js         release/
+cp    wx.js           release/
 
 echo Done!
 
diff --git a/README.md b/README.md
@@ -26,43 +26,17 @@ No build process is required- simply press the play button in Chrome Dev Editor
 
 ## Releasing
 
-Though there is no need for a "build" process during development, the release process requires extra effort because this project is currently closed-source and since Chrome Applications are executing from source, the released application needs to have it's Parallax-created code obfuscated prior to publication.  _Obfuscation is not really source code protection, but good obfuscation techniques can at least slow down reverse-engineering efforts._
+Though there is no need for a "build" process during development, the release process requires extra effort because certain files need be excluded from the release and the release set must be zipped up for packaging for the Chrome Web Store.
 
-- Releases of this Chrome App are source-code obfuscated with _javascript-obfuscator_ using the command-line (CLI) tools; currently tested with _javascript-obfuscator v0.18.1_.
-    - Requires (and can be installed with) Node.js.
-    - Source repository and instructions: [https://github.com/javascript-obfuscator/javascript-obfuscator](https://github.com/javascript-obfuscator/javascript-obfuscator)
-    - Live online version: [https://javascriptobfuscator.herokuapp.com/](https://javascriptobfuscator.herokuapp.com/)
-    - Anyone can use the _Beautify_ option of the [UglifyJS Demo](http://lisperator.net/uglifyjs/) or the _Nicify Javascript_ option of [http://jsnice.org](http://jsnice.org) to test the effectiveness of (or circumvent) obfuscated code.
-- The only files needing obfuscation are: _background.js_, _index.js_, _parser.js_, and _serial.js_.  All others should be unobscured.
+The following needs to be performed every time a release to the Chrome Web Store is needed.
 
-
-After performing _Set-Up for Code Obfuscation_ on the development system (usually just once), the release process itself consists of just the _Obfuscate & Release_ process.
-
-
-### Set-Up for Code Obfuscation
-
-This is a system and workspace configuration step - usually performed only once per development system.
-
-1. Install Node.js: 
-    - Tested with _Node.js v6.10.3 LTS_, installed via: [https://nodejs.org/dist/v6.10.3/node-v6.10.3-x64.msi](https://nodejs.org/dist/v6.10.3/node-v6.10.3-x64.msi)
-2. Switch to the repository's workspace:
-    - ```$ cd path_to_BlocklyProp_Launcher/```
-3. Install _javascript-obfuscator_ using Node's package manager (npm):
-    - ```$ npm install javascript-obfuscator```
-    - This will create a subfolder in your workspace called _node_modules_ which contains many Node resources including _javascript-obfuscator_.  This folder _should not_ be archived in repository commits, thus the repo's ```.gitignore``` file excludes the entire _node_modules_ folder.
-
-
-### Obfuscate & Release
-
-This is a frequent operation to be performed every time a release to the Chrome Web Store is needed.
-
-1. Create the _release_ fileset (with obfuscated Parallax JavaScript source code and unobscured public libraries):
+1. Create the _release_ fileset:
     1. Switch to the repository's workspace:
         - _IMPORTANT: On Windows platforms, open a Git Bash command window_
         - ```$ cd path_to_BlocklyProp_Launcher/```
     2. Run the _MakeRelease_ script
         - ```$ ./MakeRelease```
-        - This will clean out (or create) the _release_ subfolder and will generate the obfuscated files plus the other unobscured resources necessary for a Chrome App package.
+        - This will clean out (or create) the _release_ subfolder and will copy files into it for a Chrome App package.
             - This folder _should not_ be archived in repository commits, thus the repo's ```.gitignore``` file excludes the entire _release_ folder.
 2. Test the app by installing the _release_ subfolder contents (Load Unpackaged App from Chrome or the Chrome Apps & Extensions Developer Tool).
 3. Distribute the app by archiving (ZIP'ing) the _release_ subfolder contents (_not_ the folder; just its contents) and updating its Chrome Web Store publication.
diff --git a/background.js b/background.js
@@ -1,18 +1,4 @@
-/* Parallax Inc. ("PARALLAX") CONFIDENTIAL
-   Unpublished Copyright (c) 2017 Parallax Inc., All Rights Reserved.
-
-   NOTICE:  All information contained herein is, and remains the property of PARALLAX.  The intellectual and technical concepts contained
-   herein are proprietary to PARALLAX and may be covered by U.S. and Foreign Patents, patents in process, and are protected by trade
-   secret or copyright law.  Dissemination of this information or reproduction of this material is strictly forbidden unless prior written
-   permission is obtained from PARALLAX.  Access to the source code contained herein is hereby forbidden to anyone except current PARALLAX
-   employees, managers or contractors who have executed Confidentiality and Non-disclosure agreements explicitly covering such access.
-
-   The copyright notice above does not evidence any actual or intended publication or disclosure of this source code, which includes
-   information that is confidential and/or proprietary, and is a trade secret, of PARALLAX.  ANY REPRODUCTION, MODIFICATION, DISTRIBUTION,
-   PUBLIC PERFORMANCE, OR PUBLIC DISPLAY OF OR THROUGH USE OF THIS SOURCE CODE WITHOUT THE EXPRESS WRITTEN CONSENT OF PARALLAX IS STRICTLY
-   PROHIBITED, AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.  THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR
-   RELATED INFORMATION DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS, OR TO MANUFACTURE, USE, OR
-   SELL ANYTHING THAT IT MAY DESCRIBE, IN WHOLE OR IN PART.                                                                                */
+/* Copyright (c) 2019 Parallax Inc., All Rights Reserved. */
 
 // Register listeners to create app window upon application launch and
 // to close active serial ports upon application termination
diff --git a/index.js b/index.js
@@ -1,18 +1,4 @@
-/* Parallax Inc. ("PARALLAX") CONFIDENTIAL
- Unpublished Copyright (c) 2017 Parallax Inc., All Rights Reserved.
-
- NOTICE:  All information contained herein is, and remains the property of PARALLAX.  The intellectual and technical concepts contained
- herein are proprietary to PARALLAX and may be covered by U.S. and Foreign Patents, patents in process, and are protected by trade
- secret or copyright law.  Dissemination of this information or reproduction of this material is strictly forbidden unless prior written
- permission is obtained from PARALLAX.  Access to the source code contained herein is hereby forbidden to anyone except current PARALLAX
- employees, managers or contractors who have executed Confidentiality and Non-disclosure agreements explicitly covering such access.
-
- The copyright notice above does not evidence any actual or intended publication or disclosure of this source code, which includes
- information that is confidential and/or proprietary, and is a trade secret, of PARALLAX.  ANY REPRODUCTION, MODIFICATION, DISTRIBUTION,
- PUBLIC PERFORMANCE, OR PUBLIC DISPLAY OF OR THROUGH USE OF THIS SOURCE CODE WITHOUT THE EXPRESS WRITTEN CONSENT OF PARALLAX IS STRICTLY
- PROHIBITED, AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.  THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR
- RELATED INFORMATION DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS, OR TO MANUFACTURE, USE, OR
- SELL ANYTHING THAT IT MAY DESCRIBE, IN WHOLE OR IN PART.                                                                                */
+/* Copyright (c) 2019 Parallax Inc., All Rights Reserved. */
 
 
 // TODO: allow user to change port and server IP/addr.  Feilds and button are there, but no supporting code.
diff --git a/loader.js b/loader.js
@@ -1,19 +1,4 @@
-/* Parallax Inc. ("PARALLAX") CONFIDENTIAL
-/* Parallax Inc. ("PARALLAX") CONFIDENTIAL
- Unpublished Copyright (c) 2017 Parallax Inc., All Rights Reserved.
-
- NOTICE:  All information contained herein is, and remains the property of PARALLAX.  The intellectual and technical concepts contained
- herein are proprietary to PARALLAX and may be covered by U.S. and Foreign Patents, patents in process, and are protected by trade
- secret or copyright law.  Dissemination of this information or reproduction of this material is strictly forbidden unless prior written
- permission is obtained from PARALLAX.  Access to the source code contained herein is hereby forbidden to anyone except current PARALLAX
- employees, managers or contractors who have executed Confidentiality and Non-disclosure agreements explicitly covering such access.
-
- The copyright notice above does not evidence any actual or intended publication or disclosure of this source code, which includes
- information that is confidential and/or proprietary, and is a trade secret, of PARALLAX.  ANY REPRODUCTION, MODIFICATION, DISTRIBUTION,
- PUBLIC PERFORMANCE, OR PUBLIC DISPLAY OF OR THROUGH USE OF THIS SOURCE CODE WITHOUT THE EXPRESS WRITTEN CONSENT OF PARALLAX IS STRICTLY
- PROHIBITED, AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.  THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR
- RELATED INFORMATION DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS, OR TO MANUFACTURE, USE, OR
- SELL ANYTHING THAT IT MAY DESCRIBE, IN WHOLE OR IN PART.                                                                                */
+/* Copyright (c) 2019 Parallax Inc., All Rights Reserved. */
 
 // Programming metrics
 let txData;                                         //Data to transmit to the Propeller (size/contents created later)
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "BlocklyProp Launcher",
   "description": "A Chrome application that connects your Propeller-Powered Hardware to the BlocklyProp website.",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "manifest_version": 2,
   "minimum_chrome_version": "45",
   
diff --git a/messages.js b/messages.js
@@ -1,3 +1,5 @@
+/* Copyright (c) 2019 Parallax Inc., All Rights Reserved. */
+
 /*
  Notices
 
diff --git a/parser.js b/parser.js
diff --git a/port.js b/port.js
diff --git a/serial.js b/serial.js
diff --git a/wx.js b/wx.js

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "BlocklyProp Launcher",`
`3`	`3`	`"description": "A Chrome application that connects your Propeller-Powered Hardware to the BlocklyProp website.",`
`4`		`- "version": "0.9.6",`
	`4`	`+ "version": "0.9.7",`
`5`	`5`	`"manifest_version": 2,`
`6`	`6`	`"minimum_chrome_version": "45",`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* Copyright (c) 2019 Parallax Inc., All Rights Reserved. */`
	`2`	`+`
`1`	`3`	`/*`
`2`	`4`	`Notices`
`3`	`5`