From f9ad14d39f16ff2189a9d01e8010b7338c833ba8 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Fri, 6 Jun 2014 11:07:21 +0000 Subject: [PATCH] The service proxy auth URL shortcut may contain ;jsessionid= as part of the URL path, MKWS-203 --- tools/apache2/jasmine-dev.template | 4 ++-- tools/apache2/mkws-test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template index 935ec41..1bf7ab2 100644 --- a/tools/apache2/jasmine-dev.template +++ b/tools/apache2/jasmine-dev.template @@ -49,10 +49,10 @@ Include ${APACHE_MODULES} # jasmine test account - RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P] + RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P] # mkws devel account (e.g. memached testing) - RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P] + RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/ ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/ diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test index 495b6b7..f71972a 100644 --- a/tools/apache2/mkws-test +++ b/tools/apache2/mkws-test @@ -30,10 +30,10 @@ # standard MKWS account - RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P] + RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkws&password=mkws [P] # jasmine test account - RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P] + RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P] ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/ ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/ -- 1.7.10.4