Merge branch 'Experimental/newSaml2' into 'master'

Fix: Updated Saml2 Lib

See merge request !131

src/STS/Controllers/ShibbolethController.cs

@@ -37,30 +37,6 @@ namespace Coscine.Api.STS.Controllers
                 return Redirect(UrlGenerator.GetLoginUrl(Request));
             }
  
-            foreach (var claim in info.Principal.Claims)
-            {
-                Console.WriteLine("************************ claim ************************");
-                Console.WriteLine("claim.Issue: " + claim.Issuer); 
-                Console.WriteLine("claim.OriginalIssuer: " + claim.OriginalIssuer);
-                Console.WriteLine("--------------- claim.Properties ---------------");
-                foreach (var entry in claim.Properties)
-                {
-                    Console.WriteLine("claim.Properties entry.Key: " + entry.Key + " / claim.Properties entry.Value: " + entry.Value);
-                }
-
-                Console.WriteLine("claim.Subject.Actor: " + claim.Subject.Actor);
-                Console.WriteLine("claim.Subject.AuthenticationType: " + claim.Subject.AuthenticationType);
-                Console.WriteLine("claim.Subject.IsAuthenticated: " + claim.Subject.IsAuthenticated);
-                Console.WriteLine("claim.Subject.Label: " + claim.Subject.Label);
-                Console.WriteLine("claim.Subject.Name: " + claim.Subject.Name);
-                Console.WriteLine("claim.Subject.NameClaimType: " + claim.Subject.NameClaimType);
-                Console.WriteLine("claim.Subject.RoleClaimType: " + claim.Subject.RoleClaimType);
-                Console.WriteLine("claim.Type: " + claim.Type);
-                Console.WriteLine("claim.Value: " + claim.Value);
-                Console.WriteLine("claim.ValueType: " + claim.ValueType);
-            }
-
-
             var externalAuthenticatorModel = new ExternalAuthenticatorModel();
             var shibbolethAuthItem = externalAuthenticatorModel.GetWhere((externalAuthenticator) => externalAuthenticator.DisplayName == "Shibboleth");
 
@@ -72,8 +48,6 @@ namespace Coscine.Api.STS.Controllers
                 entity = info.Principal.FindFirstValue(ShibbolethAttributeMapping.PairwiseID);
             }
 
-            Console.WriteLine("entity for identifier: " + entity);
-
             var identifier = "";
             var entityId = "";
             if (entity.IndexOf(">") > -1)
@@ -90,11 +64,6 @@ namespace Coscine.Api.STS.Controllers
                 entityId = info.AuthenticationProperties.Items["idp"];
             }
 
-            Console.WriteLine("identifier: " + identifier);
-            Console.WriteLine("entityId: " + entityId);
-            Console.WriteLine("shibbolethAuthItem.Id: " + shibbolethAuthItem.Id);
-
-
             var mapping = externalIdModel.GetAllWhere((map) =>
                 map.ExternalId1 == identifier
                 && map.ExternalAuthenticatorId == shibbolethAuthItem.Id

src/STS/Startup.cs

@@ -94,13 +94,9 @@ namespace Coscine.Api.STS
                     var pfx = Program.Configuration.GetAndWait("coscine/global/sts/pfx");
                     var passwordString = Program.Configuration.GetStringAndWait("coscine/global/sts/pfxpassword");
 
-                    var pfx2022 = Program.Configuration.GetAndWait("coscine/global/sts/pfx2022");
-                    
                     var x509Certificate2 = new X509Certificate2(pfx, passwordString);
-                    var x509Certificate2022 = new X509Certificate2(pfx2022);
              
                     options.SPOptions.ServiceCertificates.Add(x509Certificate2);
-                    options.SPOptions.ServiceCertificates.Add(new ServiceCertificate() { Certificate = x509Certificate2022, Status = CertificateStatus.Future, Use=CertificateUse.Both });
                     options.SPOptions.WantAssertionsSigned = true;
                 });
         }