From c569fb500cf1cb4936f275bd1721f078f505da19 Mon Sep 17 00:00:00 2001 From: Will Fehrnstrom Date: Wed, 8 Apr 2020 14:24:25 -0400 Subject: [PATCH 1/5] Add 1 git-crypt collaborator New collaborators: A1F73329 Ryan Holland --- .../35D3ACA5459312DA2C815F8A234F3767A1F73329.gpg | Bin 0 -> 597 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .git-crypt/keys/default/0/35D3ACA5459312DA2C815F8A234F3767A1F73329.gpg diff --git a/.git-crypt/keys/default/0/35D3ACA5459312DA2C815F8A234F3767A1F73329.gpg b/.git-crypt/keys/default/0/35D3ACA5459312DA2C815F8A234F3767A1F73329.gpg new file mode 100644 index 0000000000000000000000000000000000000000..64da278cc48cca9581486caf04010a8b6e8a9567 GIT binary patch literal 597 zcmV-b0;>Im0gMA|Cd0Z)))v|U3;$eMh5NXP@=-3*4A)3*Rx>qqx7k+HTko8N(s$3} zD1myXYQNc)Ajcup1^sPrl1RAh`2-h?dI#a%N4|hgy9)qS7LLez&3QtxBvk-=L6@r$ zJV^kVBQrD$zKF=c6C_qFnHI}AFLe^*3v2r~j!t)%w+^-*q^QMj#mg9C)l6ORij8PF z;rdNJt^}(NoDvYia4Yh4C};O44<<*m(M5vFCS(Pd1`Rsv3k8el<-mmwc+7lvAV zO$wT`2@@8SbtG_$u8W7`r~?^>nfgTU-bivPJmLhqYY6$cudMRF)Ma!*iDZ(eP(dY* zaFFw}am1+w2e^Yn+36cvq&qYvkka+OYB0h0?xeoh^ySphKh`l*!aVeXSnjPMzeYBl zUm+3(gZQ!~Xi;ug4G%dv8R_rn^%USb6L!w{+m_3und+@nd$}b^y_t*Aw++xrX>LpT(B9!yCT#gQUvTfd^7*`{1wH8l?(W=YX~{ zg%+Y6D?er+UFmIWfobHFhpgQ7=+%b=avx%Fm#^j jI|vpfT(ry@rXPn_U)fvZQU}PBEBy%g!&-z6GT Date: Wed, 8 Apr 2020 14:31:52 -0400 Subject: [PATCH 2/5] Add ryan's pub key. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 48f643b..8eae15a 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ Hosted on GitHub Pages at http://ucladevx.com/BMaps-Backend/ ## Repo Breakdown -- Database config/data in `/database` -- Backend source code in `src/` -- tkinter GUIs in `tkinter/` -- Autodocumentation in `docs/` -- Beautiful Soup Scraping in `scraping/` +- Database config/data is in `/database` +- Backend source code is in `src/` +- tkinter GUIs is in `tkinter/` +- Autodocumentation is in `docs/` +- Beautiful Soup Scraping is in `scraping/` From 81a477b8c563af997766f062be2979e79bd27ee0 Mon Sep 17 00:00:00 2001 From: Will Fehrnstrom Date: Wed, 8 Apr 2020 14:48:22 -0400 Subject: [PATCH 3/5] Update README.md to detail how new team members should use gpg to gain access to the .envs, and how existing team members should add them to the repo's trusted developers using git-crypt. --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index 8eae15a..ab1461f 100644 --- a/README.md +++ b/README.md @@ -31,3 +31,24 @@ Hosted on GitHub Pages at http://ucladevx.com/BMaps-Backend/ - tkinter GUIs is in `tkinter/` - Autodocumentation is in `docs/` - Beautiful Soup Scraping is in `scraping/` + +## Using git crypt to get access to .env files + +- Generate a rsa2048 gpg key using the gpg tool + - `gpg full-generate-key` + - Make sure to record your passphrase in a secure location, and also to generate a revocation certificate for the key in case it gets compromised or lost + - `gpg --output revocation-cert.asc --gen-revoke ` +- Convey your gpg key through a keyfile securely to a project member, either using a pub key server, or through another clandestine channel + - To generate the key file: + - `gpg --output .gpg --export ` +- The team member will then add your pub-key to their gpg key-chain using + - `gpg --import ` + - Note that keyfile in this step is the same as the .gpg file generated in the previous step + - They may also choose to sign the key if they trust you. +- Finally, the team member will run + - `git-crypt --add-gpg-user ` + - Then they must push their changes (adding your pub key) made to the repository to the remote, and those changes pulled by you + - Note that their changes will not appear when `git status` is run, so it may be necessary to make some other change in the repository to successfully push the newly added pub key within git crypt +- Finally, once you have the updated repository they pushed, run + - `git-crypt unlock` + - you will not need to run git-crypt unlock again, since git-crypt will automatically encrypt your .envs as you push them within this repo, and decrypt them as they are pulled from the remote. GLHF. From c41eb84ae0f68d139e22a784971719870c2bb0bc Mon Sep 17 00:00:00 2001 From: Will Fehrnstrom Date: Wed, 8 Apr 2020 17:44:17 -0400 Subject: [PATCH 4/5] Add 1 git-crypt collaborator New collaborators: 9C929B99 Ryan Holland --- .../2317490C9F5D61A74D17418DDA7F8E799C929B99.gpg | Bin 0 -> 597 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .git-crypt/keys/default/0/2317490C9F5D61A74D17418DDA7F8E799C929B99.gpg diff --git a/.git-crypt/keys/default/0/2317490C9F5D61A74D17418DDA7F8E799C929B99.gpg b/.git-crypt/keys/default/0/2317490C9F5D61A74D17418DDA7F8E799C929B99.gpg new file mode 100644 index 0000000000000000000000000000000000000000..29910f0d92689945f6391f82fa8e70a838415b82 GIT binary patch literal 597 zcmV-b0;>Im0gMCT3f)d6grV;N3;#~~=2ER*nrJpwzs)Rtj4UB+xW};qYFD(eHwKU! zXY`7FC^x%;PhOZ`<*VXzV$Vh$9NJ^zVFG=%9r9R9*z5KkTD!J0)9e*_N2fcl7`cd6 zCP{n>ON4yX@OfK9i9u8xjT|_}HV(d3zPA8)05P7&-@-XB6MNR*>BJXGAUpwS#`giQ{w4GT0!>e)ZMN4LAHX0aN zQopDM(RTCa!FrnnygN%s#FTlGi?)QqDifiUG`9jhim+r&=vlXm`Tmlg&oe&^$X6E# z=DN;TwrxJP*`4&vAMjjKm6%H;(=b=K-Lij{t99)-9UBoCWSr2hm8l?%plTqR4~F{Y zX@3qgv2hya}c8%_1m-b?MpzO Date: Wed, 8 Apr 2020 17:44:50 -0400 Subject: [PATCH 5/5] Add ryan's new key --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab1461f..f1b3e8e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Hosted on GitHub Pages at http://ucladevx.com/BMaps-Backend/ - `gpg --import ` - Note that keyfile in this step is the same as the .gpg file generated in the previous step - They may also choose to sign the key if they trust you. -- Finally, the team member will run +- Finally, the team member will run: - `git-crypt --add-gpg-user ` - Then they must push their changes (adding your pub key) made to the repository to the remote, and those changes pulled by you - Note that their changes will not appear when `git status` is run, so it may be necessary to make some other change in the repository to successfully push the newly added pub key within git crypt