Skip to content

Commit 837e82c

Browse files
optionsomeoptionsome
authored
Merge pull request #272 from HSLdevcom/add-more-debug-ui-routing
DT-6870 - Add auth_basic to production debug UIs and both kela debug UIs
2 parents 096e398 + 917ef23 commit 837e82c

4 files changed

Lines changed: 161 additions & 15 deletions

File tree

‎nginx.conf‎

Lines changed: 142 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ http {
434434
}
435435

436436
server {
437-
server_name dev-hsl-debug.digitransit.fi hsl-debug.digitransit.fi;
437+
server_name hsl-debug.digitransit.fi;
438438
listen 8080;
439439

440440
if ($http_x_forwarded_proto != "https") {
@@ -451,11 +451,34 @@ http {
451451
location / {
452452
proxy_pass http://opentripplanner-hsl-v2:8080/;
453453
include basicsettings.conf;
454+
auth_basic "hsl-debug.digitransit.fi";
455+
auth_basic_user_file .htpasswd;
454456
}
455457
}
456458

457459
server {
458-
server_name dev-waltti-debug.digitransit.fi waltti-debug.digitransit.fi;
460+
server_name dev-hsl-debug.digitransit.fi;
461+
listen 8080;
462+
463+
if ($http_x_forwarded_proto != "https") {
464+
return 301 https://$host$request_uri;
465+
}
466+
467+
# Add HTTP Strict Transport Security for good measure.
468+
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
469+
470+
location /otp/actuators/ {
471+
return 404;
472+
}
473+
474+
location / {
475+
proxy_pass http://opentripplanner-hsl-v2:8080/;
476+
include basicsettings.conf;
477+
}
478+
}
479+
480+
server {
481+
server_name waltti-debug.digitransit.fi;
459482
listen 8080;
460483

461484
if ($http_x_forwarded_proto != "https") {
@@ -472,11 +495,57 @@ http {
472495
location / {
473496
proxy_pass http://opentripplanner-waltti-v2:8080/;
474497
include basicsettings.conf;
498+
auth_basic "waltti-debug.digitransit.fi";
499+
auth_basic_user_file .htpasswd;
500+
}
501+
}
502+
503+
server {
504+
server_name dev-waltti-debug.digitransit.fi;
505+
listen 8080;
506+
507+
if ($http_x_forwarded_proto != "https") {
508+
return 301 https://$host$request_uri;
509+
}
510+
511+
# Add HTTP Strict Transport Security for good measure.
512+
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
513+
514+
location /otp/actuators/ {
515+
return 404;
516+
}
517+
518+
location / {
519+
proxy_pass http://opentripplanner-waltti-v2:8080/;
520+
include basicsettings.conf;
521+
}
522+
}
523+
524+
server {
525+
server_name finland-debug.digitransit.fi;
526+
listen 8080;
527+
528+
if ($http_x_forwarded_proto != "https") {
529+
return 301 https://$host$request_uri;
530+
}
531+
532+
# Add HTTP Strict Transport Security for good measure.
533+
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
534+
535+
location /otp/actuators/ {
536+
return 404;
537+
}
538+
539+
location / {
540+
proxy_pass http://opentripplanner-finland-v2:8080/;
541+
include basicsettings.conf;
542+
auth_basic "finland-debug.digitransit.fi";
543+
auth_basic_user_file .htpasswd;
475544
}
476545
}
477546

478547
server {
479-
server_name dev-finland-debug.digitransit.fi finland-debug.digitransit.fi;
548+
server_name dev-finland-debug.digitransit.fi;
480549
listen 8080;
481550

482551
if ($http_x_forwarded_proto != "https") {
@@ -518,7 +587,30 @@ http {
518587
}
519588

520589
server {
521-
server_name dev-varely-debug.digitransit.fi varely-debug.digitransit.fi;
590+
server_name varely-debug.digitransit.fi;
591+
listen 8080;
592+
593+
if ($http_x_forwarded_proto != "https") {
594+
return 301 https://$host$request_uri;
595+
}
596+
597+
# Add HTTP Strict Transport Security for good measure.
598+
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
599+
600+
location /otp/actuators/ {
601+
return 404;
602+
}
603+
604+
location / {
605+
proxy_pass http://opentripplanner-varely-v2:8080/;
606+
include basicsettings.conf;
607+
auth_basic "varely-debug.digitransit.fi";
608+
auth_basic_user_file .htpasswd;
609+
}
610+
}
611+
612+
server {
613+
server_name dev-varely-debug.digitransit.fi;
522614
listen 8080;
523615

524616
if ($http_x_forwarded_proto != "https") {
@@ -538,6 +630,52 @@ http {
538630
}
539631
}
540632

633+
server {
634+
server_name kela-debug.digitransit.fi;
635+
listen 8080;
636+
637+
if ($http_x_forwarded_proto != "https") {
638+
return 301 https://$host$request_uri;
639+
}
640+
641+
# Add HTTP Strict Transport Security for good measure.
642+
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
643+
644+
location /otp/actuators/ {
645+
return 404;
646+
}
647+
648+
location / {
649+
proxy_pass http://opentripplanner-kela-v2:8080/;
650+
include basicsettings.conf;
651+
auth_basic "kela-debug.digitransit.fi";
652+
auth_basic_user_file .htpasswd;
653+
}
654+
}
655+
656+
server {
657+
server_name dev-kela-debug.digitransit.fi;
658+
listen 8080;
659+
660+
if ($http_x_forwarded_proto != "https") {
661+
return 301 https://$host$request_uri;
662+
}
663+
664+
# Add HTTP Strict Transport Security for good measure.
665+
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
666+
667+
location /otp/actuators/ {
668+
return 404;
669+
}
670+
671+
location / {
672+
proxy_pass http://opentripplanner-kela-v2:8080/;
673+
include basicsettings.conf;
674+
auth_basic "dev-kela-debug.digitransit.fi";
675+
auth_basic_user_file .htpasswd;
676+
}
677+
}
678+
541679
server {
542680
server_name waltti-test.digitransit.fi
543681
next-dev-hameenlinna.digitransit.fi
@@ -591,8 +729,6 @@ http {
591729
location / {
592730
proxy_pass http://digitransit-ui-waltti-test:8080;
593731
include basicsettings.conf;
594-
# auth_basic "waltti-test.digitransit.fi";
595-
# auth_basic_user_file .htpasswd;
596732
}
597733
}
598734

‎run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ sed -i "s#CDN_BASE_URL#${CDN_BASE_URL}#" /etc/nginx/common.conf
3434
sed -i "s/MOBILITY_API_KEY/${MOBILITY_API_KEY}/" /etc/nginx/external.conf
3535

3636
#set basic auth
37-
htpasswd -c -B -b .htpasswd $WALTTI_TEST_CREDENTIALS_USER $WALTTI_TEST_CREDENTIALS_PASS &>/dev/null
37+
htpasswd -c -B -b .htpasswd $DEBUG_UI_CREDENTIALS_USER $DEBUG_UI_CREDENTIALS_PASS &>/dev/null
3838

3939
#start nginx
4040
nginx

‎test.js‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,18 +298,29 @@ describe('digitransit', function() {
298298
testProxying('digitransit.fi','/','digitransit-site:8080', true);
299299
});
300300

301-
describe('otp debug', function() {
301+
describe('otp debug uis without authentication', function() {
302302
testProxying('dev-hsl-debug.digitransit.fi','/','opentripplanner-hsl-v2:8080', true);
303303
testProxying('dev-waltti-debug.digitransit.fi','/','opentripplanner-waltti-v2:8080', true);
304304
testProxying('dev-finland-debug.digitransit.fi','/','opentripplanner-finland-v2:8080', true);
305305
testProxying('dev-varely-debug.digitransit.fi','/','opentripplanner-varely-v2:8080', true);
306-
testProxying('hsl-debug.digitransit.fi','/','opentripplanner-hsl-v2:8080', true);
307-
testProxying('waltti-debug.digitransit.fi','/','opentripplanner-waltti-v2:8080', true);
308-
testProxying('finland-debug.digitransit.fi','/','opentripplanner-finland-v2:8080', true);
309-
testProxying('varely-debug.digitransit.fi','/','opentripplanner-varely-v2:8080', true);
310306
testProxying('waltti-alt-debug.digitransit.fi','/','opentripplanner-waltti-alt-v2:8080', true);
311307
});
312308

309+
describe('otp debug UIs with authentication', function() {
310+
testCallingWithoutCredentials('hsl-debug.digitransit.fi','/',true);
311+
testWithCorrectCredentials('hsl-debug.digitransit.fi','/','test','test','https://hsl-debug.digitransit.fi/',true);
312+
testCallingWithoutCredentials('waltti-debug.digitransit.fi','/',true);
313+
testWithCorrectCredentials('waltti-debug.digitransit.fi','/','test','test','https://waltti-debug.digitransit.fi/',true);
314+
testCallingWithoutCredentials('finland-debug.digitransit.fi','/',true);
315+
testWithCorrectCredentials('finland-debug.digitransit.fi','/','test','test','https://finland-debug.digitransit.fi/',true);
316+
testCallingWithoutCredentials('varely-debug.digitransit.fi','/',true);
317+
testWithCorrectCredentials('varely-debug.digitransit.fi','/','test','test','https://varely-debug.digitransit.fi/',true);
318+
testCallingWithoutCredentials('kela-debug.digitransit.fi','/',true);
319+
testWithCorrectCredentials('kela-debug.digitransit.fi','/','test','test','https://kela-debug.digitransit.fi/',true);
320+
testCallingWithoutCredentials('dev-kela-debug.digitransit.fi','/',true);
321+
testWithCorrectCredentials('dev-kela-debug.digitransit.fi','/','test','test','https://dev-kela-debug.digitransit.fi/',true);
322+
});
323+
313324
describe('ext-proxy', function() {
314325
this.timeout(5000);
315326
testCaching(null,'/out/helsinki-fi.smoove.pro/api-public/stations',false);
@@ -318,8 +329,6 @@ describe('ext-proxy', function() {
318329
});
319330

320331
describe('waltti-test ui', function() {
321-
// testCallingWithoutCredentials('waltti-test.digitransit.fi','/kissa','https://waltti-test.digitransit.fi/kissa');
322-
// testWithCorrectCredentials('waltti-test.digitransit.fi','/kissa', 'test', 'test', 'https://waltti-test.digitransit.fi/kissa', true);
323332
testRedirect('waltti-test.digitransit.fi','/kissa','https://waltti-test.digitransit.fi/kissa');
324333
testProxying('waltti-test.digitransit.fi','/','digitransit-ui-waltti-test:8080', true);
325334
});

‎test.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test
2525
-e GIRAVOLTA_VANTAA_AUTH="\"test\"" -e VARELY_BASIC_AUTH="\"test\"" -e VARELY_RT_BASIC_AUTH="\"test\"" \
2626
-e RAUMA_RT_BASIC_AUTH="\"test\"" -e RAUMA_STATIC_BASIC_AUTH="\"test\"" \
2727
-e PORI_RT_BASIC_AUTH="\"test\"" -e MH_BASIC_AUTH="\"test\"" -e RAASEPORI_RT_BASIC_AUTH="\"test\"" \
28-
-e WALTTI_TEST_CREDENTIALS_USER="test" -e WALTTI_TEST_CREDENTIALS_PASS="test" -e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \
28+
-e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \
29+
-e DEBUG_UI_CREDENTIALS_USER="test" -e DEBUG_UI_CREDENTIALS_PASS="test" \
2930
-e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" \
3031
hsldevcom/digitransit-proxy:integrationtest)
3132

0 commit comments

Comments
 (0)