Commit graph

64 commits

Author SHA1 Message Date
Rob Glew
cbc0b4be4c Version 0.2.14 2016-10-31 11:47:35 -05:00
Rob Glew
76d20774a5 Fixed merge for v0.2.13 2016-10-12 14:13:38 -05:00
Rob Glew
f8795a4c48 Version 0.2.13 2016-10-12 14:07:13 -05:00
roglew
54c1f5e409 Merge pull request #8 from tkisason/patch-1
Update pappy.py
2016-07-31 18:00:40 -05:00
Tonimir Kisasondi
a3c6e7c4f6 Update pappy.py
Minor typo fix
2016-07-31 23:44:20 +02:00
Rob Glew
f28ab4fe96 Version 0.2.12 2016-05-02 13:17:25 -04:00
Rob Glew
992edab315 Version 0.2.11 2016-04-14 17:25:59 -05:00
roglew
9d274de709 Merge pull request #7 from onizenso/master
Encryption Feature
2016-04-13 11:32:09 -05:00
Nich
0b8a805e71 Merge branch 'master' into crypt 2016-04-12 19:10:16 -04:00
Nich
c5fe21719a Salt remains the same across sessions
For Fernet to work correctly, the salt must be the same when
re-encrypting the project after a successful decryption.

This is because the key for decryption and encryption must be the
same during a single session. So if the project was decrypted with
one salt, the we want to generate a new salt to re-encrypt the file
with a new key, Fernet will cough up an exception. Presumably this
problem won't exist with other crypto-systems (e.g. AES-GCM).
2016-04-12 19:05:53 -04:00
Nich
04f3ac3199 Added deletion of crypt_file to generate new salt every session
After successfully decrypting the project, the `crypt_file` is
deleted to generate a new salt for each session.
2016-04-12 18:54:38 -04:00
Nich
a6f64f8ebc Merge branch 'crypt' 2016-04-12 18:45:16 -04:00
Nich
976287a67b Fixed Crypto errors and uncaught exceptions
The crypto salt file is no longer a thing. Now the salt is merely
appended to the `crypt_file` as the last sixteen bytes. The salt
is read from the end of the `crypt_file` on subsequent decryptions.

Added a setting for enabling 'debug' mode, using `pdb` for dynamic
debugging in pappy sessions. When needing to debug a function, or
set of functionality add the conditional `if config.debug`, then
set an entry point for `pdb` using `import pdb; pdb.set_trace()`
May remove this functionality if not desired in the main project.
2016-04-12 18:33:22 -04:00
Nich
2df463fc79 Issues with decrypting project
Pappy is no longer reading the salt correctly, and now fails out
when raising an exception. Need to fix exception handling.
2016-04-11 18:36:47 -04:00
Nich
61dc550f9e Merge branch 'master' of https://github.com/roglew/pappy-proxy into crypt 2016-04-11 17:06:03 -04:00
Nich
587cf75058 Fixed issue of system exiting during active session
When the entire OS halts during the middle of a pappy crypto
session, the `crypt` working directory is left unencrypted.
To fix this, I added another conditional into `crypto.py`'s
decryption function to enter an existing crypto working directory,
so that when the project finishes it will encrypt/exit properly.
2016-04-06 17:11:44 -04:00
Nich
772e7ee507 Fixed error when user fails to enter correct password
Pappy would raise exceptions and continued project in clear-text
when the user failed to enter the correct decryption password.

Added a boolean status variable to config `crypt_success` that
gets set to true when project decrypts correctly, otherwise it
is set to false.
2016-04-05 19:04:38 -04:00
Nich
6b8861058e Minor syntax error fix 2016-04-05 18:45:38 -04:00
Nich
f7d8df69cc Pep8 corrections 2016-04-05 18:30:49 -04:00
Nich
f5c53add9c Minor typography fixes 2016-04-05 18:10:04 -04:00
Onics
5ceedddd1a Fixed minor bugs in decrypting project
Project now decrypts properly and fails out loudly when incorrect
password is supplied. Must supply project name via command line now.
2016-04-04 19:33:21 -04:00
Rob Glew
d2f0e5c222 Version 0.2.10 2016-03-30 14:37:50 -05:00
Nich
ff8595e8f4 Minor changes, decrypt project within PappySession
Changed to decrypting project to within the PappySession object,
instead of in main. More maintainable, and makes more sense.
2016-03-28 21:51:56 +00:00
Nich
e7d1f75435 Added exception handling for failure to decrypt
When entering the wrong password, fernet throws an 'InvalidToken'
exception. This is now handled, but does not fully shutdown pappy.
Working on asking for password multiple times, then shutting down
completely after reasonable amount of total tries, e.g. 3.
2016-03-28 21:24:59 +00:00
Nich
bf914e6f86 Worked out bugs for crypto mode, it works now!
Crypto mode for pappy now works. Still need to work out the kinks
for not supplying a project file to `pappy -c`, but when supplied
encryption and decryption work.
2016-03-28 21:12:19 +00:00
Nich
a3cb5f13ed Fixed bugs with crypto.py, need to work on cleanup
Project is now properly encrypting the archive,
and now I just need to ensure proper decryption
is happening. Also need to work on cleaning up
clear text versions of the crypt project files.
Need to write tests for flushing out edge cases.
2016-03-28 06:04:27 +00:00
onizenso
c32201fd05 Tested and fixed file copying from Crypto.decrypt_project
In the function for grabbing project files (`Config.get_project_files`)
I was overcomplicating getting the current working directory.
Simplified the process and removed the bug!
2016-03-25 20:28:22 +00:00
onizenso
b56bb83558 Debugging Crypto config and temp directory creation
Attempting to get stub file creation and copying working. Fixed
syntax errors, and now attempting to get password reading working
in the test environment.
2016-03-25 19:43:43 +00:00
onizenso
ad37727c6b Added scrypt to dependencies 2016-03-25 16:33:25 +00:00
onizenso
0227830263 Minor typo and syntax fixes 2016-03-25 16:28:02 +00:00
onizenso
870d2abbe8 Removed old compress and crypto plugins
Got rid of the old plugin structure for the crypto and compress
features.
2016-03-24 20:56:35 +00:00
onizenso
5be69b205d Drastically restructured the compression and crypto features
Converted the crypto and compression plugins to core features, and
added the utility variables and functions to the Config class in
``config.py``. Added helper functions in PappySession class in
``pappy.py`` to enable the user to pass in an encrypted project archive.
Next moving to testing and debugging!
2016-03-24 20:48:40 +00:00
onizenso
6a79209224 Cleaned up local repository
Cleaned up the huge mess I created, pushing back to catch everything up.
Redoing crypto plugin as main component instead of plugin.
Likely compressing existing project files on first crypto run,
then storing the encrypted archive blob in the project directory.
When pappy started again, it will see the encrypted blob, extract
files to working directory, do all of its work in that directory,
then exit the directory, and clean up all files. A lot of work, but
worth the end result!
2016-03-23 14:27:11 +00:00
Rob Glew
9648bc44cc Version 0.2.9 2016-03-21 13:57:52 -05:00
Rob Glew
9a58a915c2 Version 0.2.8 2016-03-08 15:50:48 -06:00
Rob Glew
f4274e1e82 Version 0.2.7 2016-02-18 15:29:43 -06:00
Rob Glew
fda0166e72 Removed files breaking install 2016-02-05 15:25:23 -06:00
Rob Glew
aa81432556 Version 0.2.6 2016-02-05 10:49:58 -06:00
Rob Glew
10f30bfb47 Remove a notes file 2016-02-03 10:31:39 -06:00
Rob Glew
1acaeccf5e Version 0.2.5 2016-02-03 10:28:22 -06:00
Rob Glew
0b6a63ddbb Version 0.2.4 2016-01-28 14:53:34 -06:00
Rob Glew
d805eabeec Version 0.2.3 2016-01-27 16:51:40 -06:00
Rob Glew
28b7b7e8ff Merge branch 'master' of github.com:roglew/pappy-proxy into gh 2016-01-26 16:30:43 -06:00
Rob Glew
9a14a5541a Version 0.2.2 2016-01-26 16:23:40 -06:00
Rob Glew
d8dfcd3e24 Update README 2016-01-26 16:20:43 -06:00
Rob Glew
c5995c7bfd Update README 2016-01-23 15:11:42 -06:00
Rob Glew
2837e9053a Version 0.2.1 2016-01-22 12:38:31 -06:00
Rob Glew
26376eaaec Version 0.2.0 2016-01-19 18:00:34 -06:00
roglew
312b985229 Merge pull request #4 from Nicolka/master
Improved requests highlight
2016-01-05 17:03:06 -06:00
Rob Glew
65cc90be57 Update MANIFEST.in to fix install errors 2016-01-04 17:14:53 -06:00