Changes for next version of CERN Shibboleth

Author: ericvaandering

DocDB/cgi/ShibbolethUtilities.pm

@@ -42,8 +42,8 @@ sub FetchSecurityGroupsForShib (%) {
 
   # Otherwise map shibboleth groups to DocDB groups
 
-  push @DebugStack,"Setting DocDB groups from shibboleth groups";
-  my @ShibGroups = split /;/,$ENV{ADFS_GROUP};
+  push @DebugStack,"Setting DocDB groups from shibboleth groups ".$ENV{CERN_ROLES};
+  my @ShibGroups = split /;/,$ENV{CERN_ROLES};
 
   foreach my $ShibGroup (@ShibGroups) {
     if ($ShibGroupMap{$ShibGroup}) {
@@ -59,7 +59,7 @@ sub FetchSecurityGroupsForShib (%) {
 }
 
 sub FetchEmailUserIDForShib () {
-  my $ShibName = $ENV{ADFS_LOGIN};
+  my $ShibName = $ENV{CERN_LOGIN};
   push @DebugStack,"Finding EmailUserID by shibboleth name $ShibName";
 
   my $EmailUserSelect = $dbh->prepare("select EmailUserID from EmailUser ".
@@ -103,10 +103,10 @@ sub GetUserInfoShib() {
   my $EmailAddress = "Unknown";
   my $Name = "Unknown";
 
-  if (exists $ENV{'ADFS_LOGIN'}) {
-    $Name = $ENV{ADFS_FULLNAME};
-    $EmailAddress = $ENV{ADFS_EMAIL};
-    $Username = $ENV{ADFS_LOGIN};
+  if (exists $ENV{'CERN_LOGIN'}) {
+    $Name = $ENV{CERN_FULLNAME};
+    $EmailAddress = $ENV{CERN_EMAIL};
+    $Username = $ENV{CERN_LOGIN};
   }
 
   push @DebugStack, "GetUserInfoShib returning $Username, $Username, $EmailAddress, $Name";

docker/MyConfig.pm

@@ -0,0 +1,67 @@
+$CPAN::Config = {
+  'applypatch' => q[],
+  'auto_commit' => q[0],
+  'build_cache' => q[100],
+  'build_dir' => q[/root/.cpan/build],
+  'build_dir_reuse' => q[0],
+  'build_requires_install_policy' => q[yes],
+  'bzip2' => q[],
+  'cache_metadata' => q[1],
+  'check_sigs' => q[0],
+  'colorize_output' => q[0],
+  'commandnumber_in_prompt' => q[1],
+  'connect_to_internet_ok' => q[1],
+  'cpan_home' => q[/root/.cpan],
+  'curl' => q[/usr/bin/curl],
+  'ftp_passive' => q[1],
+  'ftp_proxy' => q[],
+  'getcwd' => q[cwd],
+  'gpg' => q[/usr/bin/gpg],
+  'gzip' => q[/usr/bin/gzip],
+  'halt_on_failure' => q[0],
+  'histfile' => q[/root/.cpan/histfile],
+  'histsize' => q[100],
+  'http_proxy' => q[],
+  'inactivity_timeout' => q[0],
+  'index_expire' => q[1],
+  'inhibit_startup_message' => q[0],
+  'keep_source_where' => q[/root/.cpan/sources],
+  'load_module_verbosity' => q[none],
+  'make' => q[/usr/bin/make],
+  'make_arg' => q[],
+  'make_install_arg' => q[],
+  'make_install_make_command' => q[/usr/bin/make],
+  'makepl_arg' => q[],
+  'mbuild_arg' => q[],
+  'mbuild_install_arg' => q[],
+  'mbuild_install_build_command' => q[./Build],
+  'mbuildpl_arg' => q[],
+  'no_proxy' => q[],
+  'pager' => q[/usr/bin/less],
+  'patch' => q[],
+  'perl5lib_verbosity' => q[none],
+  'prefer_external_tar' => q[1],
+  'prefer_installer' => q[MB],
+  'prefs_dir' => q[/root/.cpan/prefs],
+  'prerequisites_policy' => q[follow],
+  'scan_cache' => q[atstart],
+  'shell' => undef,
+  'show_unparsable_versions' => q[0],
+  'show_upload_date' => q[0],
+  'show_zero_versions' => q[0],
+  'tar' => q[/usr/bin/tar],
+  'tar_verbosity' => q[none],
+  'term_is_latin' => q[1],
+  'term_ornaments' => q[1],
+  'test_report' => q[0],
+  'trust_test_report_history' => q[0],
+  'unzip' => q[],
+  'urllist' => [q[http://ftp.halifax.rwth-aachen.de/cpan/], q[http://mirror.koddos.net/CPAN/], q[http://tux.rainside.sk/CPAN/]],
+  'use_sqlite' => q[0],
+  'version_timeout' => q[15],
+  'wget' => q[],
+  'yaml_load_code' => q[0],
+  'yaml_module' => q[YAML],
+};
+1;
+__END__