ComputerSurge/shields
3
0
Fork 0
Code Pull Requests 1 Activity

Contain all private files in private/

Browse Source
This commit is contained in:
Thaddee Tyl
2017-02-05 15:59:34 +01:00
parent efc9ce8eed
commit 7c8b0e3d32
7 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -4,8 +4,7 @@
/coverage.html /coverage.html
/redis /redis
/ServerScript /ServerScript
/secret.json /private
/.github-user-tokens.json
# Installed npm modules # Installed npm modules
node_modules node_modules

7
INSTALL.md
View File

@@ -137,7 +137,7 @@ Successfully built 4471b442c220
Then run the container: Then run the container:
```console ```console
$ docker run --rm -p 8080:80 -v "$(pwd)/secret.json":/usr/src/app/secret.json --name shields shields $ docker run --rm -p 8080:80 -v "$(pwd)/private/secret.json":/usr/src/app/secret.json --name shields shields
> gh-badges@1.1.2 start /usr/src/app > gh-badges@1.1.2 start /usr/src/app
> node server.js > node server.js
@@ -149,21 +149,20 @@ Assuming Docker is running locally, you should be able to get to the application
# Secret.json # Secret.json
Some services require the use of secret tokens or passwords. Those are stored in a file called `secret.json` that is not checked into the repository, to avoid impersonation. Here is how it currently looks like: Some services require the use of secret tokens or passwords. Those are stored in `private/secret.json` which is not checked into the repository, to avoid impersonation. Here is how it currently looks like:
``` ```
bintray_apikey bintray_apikey
bintray_user bintray_user
gh_client_id gh_client_id
gh_client_secret gh_client_secret
gitter_dev_secret
shieldsIps shieldsIps
shieldsSecret shieldsSecret
sl_insight_apiToken sl_insight_apiToken
sl_insight_userUuid sl_insight_userUuid
``` ```
(Gathered from `cat secret.json | jq keys | grep -o '".*"' | sed 's/"//g'`.) (Gathered from `cat private/secret.json | jq keys | grep -o '".*"' | sed 's/"//g'`.)
# Main Server Sysadmin # Main Server Sysadmin

6
Makefile
View File

@@ -24,7 +24,7 @@ deploy: deploy-s0 deploy-s1 deploy-gh-pages
deploy-s0: deploy-s0:
git add -f Verdana.ttf git add -f Verdana.ttf
git add -f secret.json git add -f private/secret.json
git commit -m'MUST NOT BE ON GITHUB' git commit -m'MUST NOT BE ON GITHUB'
git push -f s0 HEAD:master git push -f s0 HEAD:master
git reset HEAD~1 git reset HEAD~1
@@ -32,7 +32,7 @@ deploy-s0:
deploy-s1: deploy-s1:
git add -f Verdana.ttf git add -f Verdana.ttf
git add -f secret.json git add -f private/secret.json
git commit -m'MUST NOT BE ON GITHUB' git commit -m'MUST NOT BE ON GITHUB'
git push -f s1 HEAD:master git push -f s1 HEAD:master
git reset HEAD~1 git reset HEAD~1
@@ -46,7 +46,7 @@ deploy-gh-pages:
deploy-heroku: deploy-heroku:
git add -f Verdana.ttf git add -f Verdana.ttf
git add -f secret.json git add -f private/secret.json
git commit -m'MUST NOT BE ON GITHUB' git commit -m'MUST NOT BE ON GITHUB'
git push -f heroku HEAD:master git push -f heroku HEAD:master
git reset HEAD~1 git reset HEAD~1

4
lib/github-auth.js
View File

@@ -5,10 +5,10 @@ var serverSecrets;
try { try {
// Everything that cannot be checked in but is useful server-side // Everything that cannot be checked in but is useful server-side
// is stored in this JSON data. // is stored in this JSON data.
serverSecrets = require('../secret.json'); serverSecrets = require('../private/secret.json');
} catch(e) {} } catch(e) {}
var githubUserTokens; var githubUserTokens;
var githubUserTokensFile = '.github-user-tokens.json'; var githubUserTokensFile = './private/github-user-tokens.json';
autosave(githubUserTokensFile, {data:[]}).then(function(f) { autosave(githubUserTokensFile, {data:[]}).then(function(f) {
githubUserTokens = f; githubUserTokens = f;
for (var i = 0; i < githubUserTokens.data.length; i++) { for (var i = 0; i < githubUserTokens.data.length; i++) {

2
package.json
View File

@@ -27,7 +27,7 @@
"chrome-web-store-item-property": "~1.1.2", "chrome-web-store-item-property": "~1.1.2",
"dot": "~1.0.3", "dot": "~1.0.3",
"gm": "^1.23.0", "gm": "^1.23.0",
"json-autosave": "~1.1.1", "json-autosave": "~1.1.2",
"pdfkit": "~0.8.0", "pdfkit": "~0.8.0",
"redis": "~2.6.2", "redis": "~2.6.2",
"request": "~2.75.0", "request": "~2.75.0",

6
server.js
View File

@@ -27,8 +27,10 @@ var serverSecrets;
try { try {
// Everything that cannot be checked in but is useful server-side // Everything that cannot be checked in but is useful server-side
// is stored in this JSON data. // is stored in this JSON data.
serverSecrets = require('./secret.json'); serverSecrets = require('./private/secret.json');
} catch(e) { console.error('No secret data (secret.json, see server.js):', e); } } catch(e) {
console.error('No secret data (private/secret.json, see server.js):', e);
}
if (serverSecrets && serverSecrets.gh_client_id) { if (serverSecrets && serverSecrets.gh_client_id) {
githubAuth.setRoutes(camp); githubAuth.setRoutes(camp);
} }

6
suggest.js
View File

@@ -4,8 +4,10 @@ var serverSecrets;
try { try {
// Everything that cannot be checked in but is useful server-side // Everything that cannot be checked in but is useful server-side
// is stored in this JSON data. // is stored in this JSON data.
serverSecrets = require('./secret.json'); serverSecrets = require('./private/secret.json');
} catch(e) { console.error('No secret data (secret.json, see server.js):', e); } } catch(e) {
console.error('No secret data (private/secret.json, see server.js):', e);
}
// data: {url}, JSON-serializable object. // data: {url}, JSON-serializable object.
// end: function(json), with json of the form: // end: function(json), with json of the form: