Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Christophe Maudoux 2018-05-07 22:58:05 +02:00
commit 027a122c7e
4 changed files with 15 additions and 14 deletions

View File

@ -405,7 +405,6 @@ prepare_test_server:
INITDIR=`pwd`/e2e-tests/conf/init \
ETCDEFAULTDIR=`pwd`/e2e-tests/conf/def
#@cp -f e2e-tests/index.* e2e-tests/conf/
@perl -i -pe 's/example\.com/example.com:19876/g' e2e-tests/conf/site/index.pl
@cp -f $(SRCMANAGERDIR)/site/htdocs/manager* e2e-tests/conf/manager
@cp -f $(SRCPORTALDIR)/site/htdocs/index* e2e-tests/conf/portal
@cp e2e-tests/saml-sp.xml e2e-tests/conf/site/saml-sp.xml

View File

@ -6,10 +6,10 @@ use CGI;
use AuthCAS;
# Configuration
my $host = $ENV{HTTP_HOST};
my ($domain) = ( $host =~ /\w+\.(.*)/ );
my $protocol = $ENV{HTTPS} ? "https" : "http";
my $portal_url = "$protocol://auth.$domain";
my $host = $ENV{HTTP_HOST};
my ( $domain, $port ) = ( $host =~ /\w+\.(.*?):(\d*)/ );
my $protocol = ( $ENV{HTTPS} =~ /^on$/i ) ? "https" : "http";
my $portal_url = "$protocol://auth.$domain:$port";
my $cas_url = "$portal_url/cas";
my $cas = new AuthCAS( casUrl => $cas_url );
my $cgi = new CGI;

View File

@ -15,10 +15,10 @@ my $color = $cgi->param("color") || "#ddd";
# Local parameters
my $host = $ENV{HTTP_HOST};
my ( $domain ) = ( $host =~ /\w+\.(.*)/ );
my $protocol = $ENV{HTTPS} ? "https" : "http";
my $portal_url = "$protocol://auth.$domain";
my $manager_url = "$protocol://manager.$domain";
my ( $domain, $port ) = ( $host =~ /\w+\.(.*?):(\d*)/ );
my $protocol = ( $ENV{HTTPS} =~ /^on$/i ) ? "https" : "http";
my $portal_url = "$protocol://auth.$domain:$port";
my $manager_url = "$protocol://manager.$domain:$port";
# CSS
my $css = <<EOT;
@ -67,7 +67,8 @@ print
"<script type=\"text/javascript\" src=\"$portal_url/static/bwr/jquery/dist/jquery.js\"></script>\n";
print
"<script type=\"text/javascript\" src=\"$portal_url/static/bwr/jquery-ui/jquery-ui.js\"></script>\n";
print "<script src=\"$portal_url/static/bwr/bootstrap/dist/js/bootstrap.js\"></script>\n";
print
"<script src=\"$portal_url/static/bwr/bootstrap/dist/js/bootstrap.js\"></script>\n";
print "</head>\n";
print "<body>\n";

View File

@ -18,10 +18,10 @@ use Digest::SHA
#==============================================================================
# Configuration
#==============================================================================
my $host = $ENV{HTTP_HOST};
my ($domain) = ( $host =~ /\w+\.(.*)/ );
my $protocol = $ENV{HTTPS} ? "https" : "http";
my $portal_url = "$protocol://auth.$domain";
my $host = $ENV{HTTP_HOST};
my ( $domain, $port ) = ( $host =~ /\w+\.(.*?):(\d*)/ );
my $protocol = ( $ENV{HTTPS} =~ /^on$/i ) ? "https" : "http";
my $portal_url = "$protocol://auth.$domain:$port";
my $client_id = "lemonldap";
my $client_secret = "secret";
my $authorization_uri = "$portal_url/oauth2/authorize";
@ -662,6 +662,7 @@ else {
my $login_hint = uri_escape("coudot");
my $max_age = 3600;
my $id_token_hint = "";
#"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhenAiOiJsZW1vbmxkYXAiLCJzdWIiOiJjb3Vkb3RAbGluYWdvcmEuY29tIiwiaWF0IjoxNDI3Mjk5MjMyLCJhdXRoX3RpbWUiOjE0MjcyOTYwNTQsImV4cCI6IjM2MDAiLCJub25jZSI6IjEyMzQ1Njc4OTAiLCJhdWQiOlsibGVtb25sZGFwIl0sImF0X2hhc2giOiJwZEdBcG9lVE8tNTM0el9XQ2wxcUtRIiwiYWNyIjoibG9hLTIiLCJpc3MiOiJodHRwOi8vYXV0aC5leGFtcGxlLmNvbS8ifQ==.R7nddv9bom+J2hyrTe/7a4mRupJAoDioBYaop+Q94Fg";
my $request_paylod_hash = {