From 53a2440e3cbc2e8e7c8224d2b78c4f6fbd3f43a6 Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 25 Mar 2019 13:15:37 +0100 Subject: [PATCH 1/3] Add needed env var PRIVATE_KEY_PASSPHRASE + fix WebFinger test --- backend/src/activitypub/ActivityPub.js | 2 +- backend/src/activitypub/utils/index.js | 1 - backend/src/server.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/activitypub/ActivityPub.js b/backend/src/activitypub/ActivityPub.js index b89bc16da..1f0c0e4c8 100644 --- a/backend/src/activitypub/ActivityPub.js +++ b/backend/src/activitypub/ActivityPub.js @@ -22,6 +22,7 @@ let activityPub = null export { activityPub } export default class ActivityPub { + constructor (activityPubEndpointUri, internalGraphQlUri) { this.endpoint = activityPubEndpointUri this.dataSource = new NitroDataSource(internalGraphQlUri) @@ -56,7 +57,6 @@ export default class ActivityPub { } }, async (err, response, toActorObject) => { if (err) return reject(err) - debug(`name = ${toActorName}@${this.host}`) // save shared inbox toActorObject = JSON.parse(toActorObject) await this.dataSource.addSharedInboxEndpoint(toActorObject.endpoints.sharedInbox) diff --git a/backend/src/activitypub/utils/index.js b/backend/src/activitypub/utils/index.js index e6853cecb..a83dcc829 100644 --- a/backend/src/activitypub/utils/index.js +++ b/backend/src/activitypub/utils/index.js @@ -19,7 +19,6 @@ export function extractIdFromActivityId (uri) { return splitted[splitted.indexOf('status') + 1] } - export function constructIdFromName (name, fromDomain = activityPub.endpoint) { return `${fromDomain}/activitypub/users/${name}` } diff --git a/backend/src/server.js b/backend/src/server.js index c546c74c3..efa9a17c0 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -13,7 +13,7 @@ import decode from './jwt/decode' dotenv.config() // check env and warn -const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET'] +const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET', 'PRIVATE_KEY_PASSPHRASE'] requiredEnvVars.forEach(env => { if (!process.env[env]) { throw new Error(`ERROR: "${env}" env variable is missing.`) From 5ec77f3cc1e00f0c32dc8a8409fb3ad7e41925c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 27 Mar 2019 00:55:09 +0100 Subject: [PATCH 2/3] Put PRIVATE_KEY_PASSPHRASE in kubernetes config --- deployment/human-connection/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployment/human-connection/configmap.yaml b/deployment/human-connection/configmap.yaml index 592bae1c0..5e4d6ba89 100644 --- a/deployment/human-connection/configmap.yaml +++ b/deployment/human-connection/configmap.yaml @@ -10,6 +10,7 @@ NEO4J_AUTH: "none" CLIENT_URI: "https://nitro-staging.human-connection.org" MAPBOX_TOKEN: "pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ" + PRIVATE_KEY_PASSPHRASE: "a7dsf78sadg87ad87sfagsadg78" metadata: name: configmap namespace: human-connection From 82bb4c4d7d70e77db5cb9a33ce8803145c7e8c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 27 Mar 2019 11:26:07 +0100 Subject: [PATCH 3/3] Fix lint --- backend/src/activitypub/ActivityPub.js | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/activitypub/ActivityPub.js b/backend/src/activitypub/ActivityPub.js index 1f0c0e4c8..3ce27e109 100644 --- a/backend/src/activitypub/ActivityPub.js +++ b/backend/src/activitypub/ActivityPub.js @@ -22,7 +22,6 @@ let activityPub = null export { activityPub } export default class ActivityPub { - constructor (activityPubEndpointUri, internalGraphQlUri) { this.endpoint = activityPubEndpointUri this.dataSource = new NitroDataSource(internalGraphQlUri)