Skip to content

Commit 3f417f2

Browse files
committed
Fixed $ORIGIN not to include default ports
1 parent 2a4232c commit 3f417f2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

platform/entrypoint.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,20 +217,22 @@ if [ "$PROTOCOL" = "https" ]; then
217217
if [ "$HTTPS_PROXY_PORT" = 443 ]; then
218218
export BASE_URI="${PROTOCOL}://${HOST}${ABS_PATH}"
219219
export ADMIN_BASE_URI="${PROTOCOL}://admin.${HOST}${ABS_PATH}"
220+
export ORIGIN="${PROTOCOL}://${HOST}"
220221
else
221222
export BASE_URI="${PROTOCOL}://${HOST}:${HTTPS_PROXY_PORT}${ABS_PATH}"
222223
export ADMIN_BASE_URI="${PROTOCOL}://admin.${HOST}:${HTTPS_PROXY_PORT}${ABS_PATH}"
224+
export ORIGIN="${PROTOCOL}://${HOST}:${HTTPS_PROXY_PORT}"
223225
fi
224-
export ORIGIN="${PROTOCOL}://${HOST}:${HTTPS_PROXY_PORT}"
225226
else
226227
if [ "$HTTP_PROXY_PORT" = 80 ]; then
227228
export BASE_URI="${PROTOCOL}://${HOST}${ABS_PATH}"
228229
export ADMIN_BASE_URI="${PROTOCOL}://admin.${HOST}${ABS_PATH}"
230+
export ORIGIN="${PROTOCOL}://${HOST}"
229231
else
230232
export BASE_URI="${PROTOCOL}://${HOST}:${HTTP_PROXY_PORT}${ABS_PATH}"
231233
export ADMIN_BASE_URI="${PROTOCOL}://admin.${HOST}:${HTTP_PROXY_PORT}${ABS_PATH}"
234+
export ORIGIN="${PROTOCOL}://${HOST}:${HTTP_PROXY_PORT}"
232235
fi
233-
export ORIGIN="${PROTOCOL}://${HOST}:${HTTP_PROXY_PORT}"
234236
fi
235237

236238
BASE_URI=$(echo "$BASE_URI" | tr '[:upper:]' '[:lower:]') # make sure it's lower-case

src/main/java/com/atomgraph/linkeddatahub/Application.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,6 @@ public void handleAuthorizationCreated(AuthorizationCreated event) throws Messag
11941194
/**
11951195
* Matches application by type and request URL.
11961196
*
1197-
* @param type app type
11981197
* @param absolutePath request URL without the query string
11991198
* @return app resource or null, if none matched
12001199
*/

0 commit comments

Comments
 (0)