-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
196 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| <?php | ||
|
|
||
| class Encryption{ | ||
|
|
||
| /** | ||
| * $key must have been generated at some point with: random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES) | ||
| */ | ||
| function encryptText($text,$key) | ||
| { | ||
| $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES); | ||
| $ciphertext = sodium_crypto_secretbox($text, $nonce, $key); | ||
| $encoded = base64_encode($nonce . $ciphertext); | ||
| return $encoded; | ||
| } | ||
|
|
||
| /** | ||
| * $key must have been generated at some point with: random_bytes(SODIUM_CRYPTO_SECRETBOX_KEYBYTES) | ||
| */ | ||
| function decryptText($encoded,$key) | ||
| { | ||
| $decoded = base64_decode($encoded); | ||
| $nonce = mb_substr($decoded, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit'); | ||
|
|
||
|
|
||
| $ciphertext = mb_substr($decoded, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit'); | ||
| $plaintext = sodium_crypto_secretbox_open($ciphertext, $nonce, $key); | ||
| return $plaintext; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * $key must have been generated at some point with: sodium_crypto_secretstream_xchacha20poly1305_keygen(); | ||
| */ | ||
| function encryptFile($infile,$enc_outfile,$key) | ||
| { | ||
| $chunk_size = 4096; | ||
|
|
||
| $fd_in = fopen($infile, 'rb'); | ||
| $fd_out = fopen($enc_outfile, 'wb'); | ||
|
|
||
| list($stream, $header) = sodium_crypto_secretstream_xchacha20poly1305_init_push($key); | ||
|
|
||
| fwrite($fd_out, $header); | ||
|
|
||
| $tag = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE; | ||
| do { | ||
| $chunk = fread($fd_in, $chunk_size); | ||
| if (feof($fd_in)) { | ||
| $tag = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL; | ||
| } | ||
| $encrypted_chunk = sodium_crypto_secretstream_xchacha20poly1305_push($stream, $chunk, '', $tag); | ||
| fwrite($fd_out, $encrypted_chunk); | ||
| } while ($tag !== SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL); | ||
|
|
||
| fclose($fd_out); | ||
| fclose($fd_in); | ||
| } | ||
|
|
||
| /** | ||
| * $key must have been generated at some point with: sodium_crypto_secretstream_xchacha20poly1305_keygen(); | ||
| */ | ||
| function decryptFile($enc_infile,$outfile,$key) | ||
| { | ||
| $fd_in = fopen($enc_infile, 'rb'); | ||
| $fd_out = fopen($outfile, 'wb'); | ||
| $chunk_size = 4096; | ||
|
|
||
| $header = fread($fd_in, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES); | ||
|
|
||
| $stream = sodium_crypto_secretstream_xchacha20poly1305_init_pull($header, $key); | ||
| do { | ||
| $chunk = fread($fd_in, $chunk_size + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES); | ||
| list($decrypted_chunk, $tag) = sodium_crypto_secretstream_xchacha20poly1305_pull($stream, $chunk); | ||
| fwrite($fd_out, $decrypted_chunk); | ||
| } while (!feof($fd_in) && $tag !== SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL); | ||
| $ok = feof($fd_in); | ||
|
|
||
| fclose($fd_out); | ||
| fclose($fd_in); | ||
|
|
||
| if (!$ok) { | ||
| die('Invalid/corrupted input'); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # Encryption | ||
|
|
||
| As of Jan. 2020 you can set up an encryption key in your config which will encrypt all images stored on [external storage](/rtfm/CONFIG.md#storage-controllers) | ||
|
|
||
| The files on the PictShare server are not encrypted, only the ones on external storage providers, eg if you want to use S3 as storage. | ||
|
|
||
| ## Dependencies | ||
|
|
||
| To be able to use encryption you'll need the following extensions: | ||
|
|
||
| - mb-string (`apt-get install php-mbstring`) | ||
| - libsodium (`apt-get install php-libsodium`) | ||
|
|
||
| Since only files on [storage controllers](/rtfm/CONFIG.md#storage-controllers) are encrypted, you'll need to configure at least one. | ||
|
|
||
| ## Preparation | ||
|
|
||
| First you'll need to generate a key and encode it in base64. | ||
| The easiest way to get it would be to run this command: | ||
|
|
||
| `php -r "echo base64_encode(sodium_crypto_secretstream_xchacha20poly1305_keygen());"` | ||
|
|
||
| This will output something like `SSdoJvp10ZvOY5v+vAcprxQKjNX1AzD52cAnFwr6yXc=` | ||
|
|
||
| Now put this output in your /inc/config.inc.php like this: | ||
|
|
||
| `define('ENCRYPTION_KEY','SSdoJvp10ZvOY5v+vAcprxQKjNX1AzD52cAnFwr6yXc=');` | ||
|
|
||
| **Warning: If you change or lose the ENCRYPTION_KEY, all encrypted data will be unrecoverably lost** | ||
|
|
||
| # How it works | ||
|
|
||
| If you have everything running you can upload a new image and it will get encrypted and uploaded to your storage container(s). This means you could even host on untrusted servers/buckets since nobody without the key will be able to decrypt it. | ||
|
|
||
| If you have uploaded a few files and see them on your storage container (eg S3) you'll notice the file has the '.enc' extension. | ||
|
|
||
| When you now wipe your PictShare instances local data folder and request the file again via the URL, the storage controller will pull the encrypted file, decrypt it and save it locally (unencrypted) | ||
|
|
||
| # Todo | ||
|
|
||
| - Automatically encrypt all existing (unencrypted) files on the storage controllers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters