Merge pull request #18 from aviaryan/v2

v2

Author: aviaryan

README.markdown

@@ -2,7 +2,7 @@
 	Sublime Notebook :memo:
 </h1> 
 
-**v1.0**
+**v2.0**
 
 Sublime Notebook is an attempt to use Sublime Text as a complete note taking application.
 
@@ -25,7 +25,7 @@ The result is this project, a wrapper/idea that converts my favorite text editor
 
 * Faaaast Search across all notes (thanks to Sublime Text)
 * Hierarchical organization and display of notes
-* Password based encryption for notes
+* Password based encryption for notes (thanks to [pyAES](https://github.com/ricmoo/pyaes))
 * Cloud sync (Dropbox, Google Drive, Box, etc)
 * Periodic git backup (to Github, Gitlab, your own private git server, etc)
 * Markdown based markup and code syntax highlighting

notebook.sublime-project

@@ -2,32 +2,49 @@
 	"build_systems":
 	[
 		{
+			"linux":
+			{
+				"shell_cmd": "gnome-terminal -e './manager.py; exec bash\"'"
+			},
 			"name": "manager.py",
-			"working_dir": "${project_path}",
-			"osx": {
+			"osx":
+			{
 				"shell_cmd": "open -a Terminal.app ${project_path}"
 			},
-			"linux": {
-				// http://stackoverflow.com/questions/21196077/sublime-text-3-compile-program-and-run-in-terminal
-				"shell_cmd": "gnome-terminal -e './manager.py; exec bash\"'"
+			"windows":
+			{
+				"cmd":
+				[
+					"start",
+					"cmd",
+					"/k",
+					"python manager.py"
+				],
+				"shell": true
 			},
-			"windows": {
-				// http://stackoverflow.com/questions/19942347/run-program-in-cmd-mode-after-building-from-sublime-text-2
-				"cmd": ["start", "cmd", "/k", "python manager.py"],
-            	"shell": true,
-			}
+			"working_dir": "${project_path}"
 		}
 	],
 	"folders":
 	[
 		{
-			"path": ".",
-			"folder_exclude_patterns": ["__pycache__"],
-			"file_exclude_patterns": ["*.pyc"]
+			"file_exclude_patterns":
+			[
+				"*.pyc",
+				"////sublime_notebook/*.py"
+			],
+			"folder_exclude_patterns":
+			[
+				"__pycache__",
+				".release",
+				"////sublime_notebook/pyaes"
+			],
+			"path": "."
 		}
 	],
-	"settings": {
-		"word_wrap": true,
- 		"margin": 20
+	"settings":
+	{
+		"margin": 20,
+		"word_wrap": true
 	}
 }

sublime_notebook/__init__.py

@@ -1,2 +1,2 @@
 SETTINGS_PATH = 'sublime_notebook/settings.json'
-VERSION = 1.0
+VERSION = 2.0

sublime_notebook/cryptlib.py

@@ -1,17 +1,21 @@
 import base64
 import os
+from traceback import print_exc
 import re
 from getpass import getpass
 from .settings import Settings
 from .message import print_err
+from .pyaes import AESModeOfOperationCTR
 
 
 EXTRA_STR = 'ENCo0D#DT{xTCh$cKe>'
 ENCODED_IDF = '=*=EnC0d3dH3aDer==*'
+EXTRA_STR_2 = '3NCo0D#DT{xTCh$cKe>'
+ENCODED_IDF_2 = '=*=3nC0d3dH3aDer==*'
 
 # Vigenere's Cipher: http://stackoverflow.com/a/38223403
 
-def encode(key, clear):
+def encode_1(key, clear):
     if clear.startswith(ENCODED_IDF):  # already encoded, no need to encode
         return clear
     clear += EXTRA_STR  # used to check if decrypt is correct
@@ -24,7 +28,7 @@ def encode(key, clear):
     return ENCODED_IDF + base64.urlsafe_b64encode("".join(enc).encode()).decode()
 
 
-def decode(key, enc):
+def decode_1(key, enc):
     st = ''
     if not enc.startswith(ENCODED_IDF):  # not encoded, so not decode
         return enc
@@ -44,6 +48,40 @@ def decode(key, enc):
         return st[:-1 * len(EXTRA_STR)]
 
 
+def encode(key, clear):
+    if clear.startswith(ENCODED_IDF) or clear.startswith(ENCODED_IDF_2):  # already encoded, no need to encode
+        return clear
+    clear += EXTRA_STR_2  # used to check if decrypt is correct
+    # encrypt string
+    aes = AESModeOfOperationCTR(key_32(key))
+    clear = bytes(clear, 'utf8')  # everyone writes in utf8
+    ciphertext = aes.encrypt(clear)
+    return ENCODED_IDF_2 + base64.urlsafe_b64encode(ciphertext).decode('iso-8859-1')
+
+
+def decode(key, enc):
+    st = ''
+    if not (enc.startswith(ENCODED_IDF_2) or enc.startswith(ENCODED_IDF)):  # not encoded, so not decode
+        return enc
+    if enc.startswith(ENCODED_IDF):  # old version
+        return decode_1(key, enc)
+    # new version
+    enc = enc[len(ENCODED_IDF_2):]  # trim out idf
+    # https://wiki.python.org/moin/Python3UnicodeDecodeError
+    # seems like the bytes created by pyaes are best decrypted using it
+    enc = base64.urlsafe_b64decode(enc).decode('iso-8859-1')
+    # decode string
+    aes = AESModeOfOperationCTR(key_32(key))
+    st = aes.decrypt(enc)
+    st = st.decode('utf8')  # because utf8 is what everyone uses
+    # ^^ decode error might be returned even when password is wrong
+    # check if correctly decoded
+    if not st.endswith(EXTRA_STR_2):
+        return None
+    else:
+        return st[:-1 * len(EXTRA_STR_2)]
+
+
 def get_file_list():
     listFiles = []
     sts = Settings()
@@ -71,11 +109,15 @@ def update_file(funcptr, flist, key):
         data = fptr.read()
         fptr.close()
         fptr = open(file, 'w')
-        newData = funcptr(key, data)
+        try:
+            newData = funcptr(key, data)
+        except Exception:
+            print_exc()
+            newData = None  # handled sufficiently well now
         if newData is None:
             newData = data
             failed = True
-            print_err('Failed decrypting %s' % file)
+            print_err('Failed processing %s' % file)
         fptr.write(newData)
         fptr.close()
         # check if failed
@@ -89,3 +131,11 @@ def get_key():
     while key == '':
         key = getpass('Enter key > ')
     return key
+
+
+def key_32(key):
+    if len(key) > 32:
+        key = key[:32]
+    else:
+        key = key + ('0' * (32 - len(key)))
+    return bytes(key, 'utf8')

sublime_notebook/pyaes/__init__.py

@@ -0,0 +1,53 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Richard Moore
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# This is a pure-Python implementation of the AES algorithm and AES common
+# modes of operation.
+
+# See: https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
+# See: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation
+
+
+# Supported key sizes:
+#   128-bit
+#   192-bit
+#   256-bit
+
+
+# Supported modes of operation:
+#   ECB - Electronic Codebook
+#   CBC - Cipher-Block Chaining
+#   CFB - Cipher Feedback
+#   OFB - Output Feedback
+#   CTR - Counter
+
+# See the README.md for API details and general information.
+
+# Also useful, PyCrypto, a crypto library implemented in C with Python bindings:
+# https://www.dlitz.net/software/pycrypto/
+
+
+VERSION = [1, 3, 0]
+
+from .aes import AES, AESModeOfOperationCTR, AESModeOfOperationCBC, AESModeOfOperationCFB, AESModeOfOperationECB, AESModeOfOperationOFB, AESModesOfOperation, Counter
+from .blockfeeder import decrypt_stream, Decrypter, encrypt_stream, Encrypter
+from .blockfeeder import PADDING_NONE, PADDING_DEFAULT