Skip to content

Update deprecated js_include in nginx configs #2722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 6, 2025
Merged

Update deprecated js_include in nginx configs #2722

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d5038f
Update njs configs to remove deprecated configs
jawadqur Feb 6, 2025
9a187dd
Update helpers.js
jawadqur Feb 6, 2025
d0e6b51
Update helpers.js
jawadqur Feb 6, 2025
bf4375f
Update nginx.conf
jawadqur Feb 6, 2025
f55c3e4
remove deprecated configs
jawadqur Feb 6, 2025
c1be9d7
remove deprecated configs
jawadqur Feb 6, 2025
433b53a
remove deprecated configs
jawadqur Feb 6, 2025
6dfa102
remove deprecated configs
jawadqur Feb 6, 2025
66bb245
remove deprecated configs
jawadqur Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kube/services/revproxy/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ function atob(input) {
return output;
}



/**
* nginscript helper for parsing user out of JWT tokens.
* We appear to have access to the 'access_token' variable
Expand Down Expand Up @@ -279,3 +281,5 @@ function gen3_workspace_authorize_handler(req) {
req.return(400, '{ "status": "redirect failed validation" }');
}
}

export default {userid, isCredentialsAllowed, checkBlackList, getServiceReleases};
31 changes: 7 additions & 24 deletions kube/services/revproxy/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ default_type application/octet-stream;
# Note - nginscript js_set, etc get processed
# on demand: https://www.nginx.com/blog/introduction-nginscript/
#
js_include helpers.js;
js_set $userid userid;
js_set $black_list_check checkBlackList;
js_import helpers.js;
js_set $userid helpers.userid;
js_set $black_list_check helpers.checkBlackList;

# Modsecurity and blacklist configuration
include /etc/nginx/gen3_server*.conf;
Expand All @@ -98,7 +98,7 @@ perl_set $canary_percent_json 'sub { return $ENV{"CANARY_PERCENT_JSON"}; }';
##
# Service release parsing and assignment
#
js_set $service_releases getServiceReleases;
#js_set $service_releases helpers.getServiceReleases;

##
# Logging Settings
Expand Down Expand Up @@ -166,7 +166,7 @@ perl_set $des_domain 'sub { return $ENV{"DES_NAMESPACE"} ? qq{.$ENV{"DES_NAMESPA
# CORS Credential White List
##
perl_set $origins_allow_credentials 'sub { return $ENV{"ORIGINS_ALLOW_CREDENTIALS"}; }';
js_set $credentials_allowed isCredentialsAllowed;
js_set $credentials_allowed helpers.isCredentialsAllowed;

## For multi-domain deployments
perl_set $csrf_cookie_domain 'sub { return $ENV{"COOKIE_DOMAIN"} ? qq{;domain=$ENV{"COOKIE_DOMAIN"}} : ""; }';
Expand Down Expand Up @@ -247,7 +247,7 @@ server {
more_set_headers "Access-Control-Expose-Headers: Content-Length,Content-Range";

# update service release cookie
add_header Set-Cookie "service_releases=${service_releases};Path=/;Max-Age=600;HttpOnly;Secure;SameSite=Lax";
# add_header Set-Cookie "service_releases=${service_releases};Path=/;Max-Age=600;HttpOnly;Secure;SameSite=Lax";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this intentional? I thought this is to add some madatory security related cookies

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is/ was used for some canary deployments, which was never fully implemented. We could keep it in, but I don't think we need it.


if ($request_method = 'OPTIONS') {
return 204;
Expand Down Expand Up @@ -361,29 +361,12 @@ server {
set $fence_release_name "fence";
# TODO: configure the rest of the canary-related config later
set $presigned_url_fence_release_name "presigned-url-fence";
if ($service_releases ~* "fence\.canary") {
set $fence_release_name "${fence_release_name}-canary";
}
set $fenceshib_release_name "fenceshib";
if ($service_releases ~* "fenceshib\.canary") {
set $fenceshib_release_name "${fenceshib_release_name}-canary";
}
set $sheepdog_release_name "sheepdog";
if ($service_releases ~* "sheepdog\.canary") {
set $sheepdog_release_name "${sheepdog_release_name}-canary";
}
set $peregrine_release_name "peregrine";
if ($service_releases ~* "peregrine\.canary") {
set $peregrine_release_name "${peregrine_release_name}-canary";
}
set $indexd_release_name "indexd";
if ($service_releases ~* "indexd\.canary") {
set $indexd_release_name "${indexd_release_name}-canary";
}
set $manifestservice_release_name "manifestservice";
if ($service_releases ~* "manifestservice\.canary") {
set $manifestservice_release_name "${manifestservice_release_name}-canary";
}

set $arborist_release_name "arborist";

error_page 500 501 502 503 504 @5xx;
Expand Down
Loading