Merge pull request fixes #16 from PascalBayard/develop/15-Error_more_…

…than_one_MFA_configured Develop/15 error more than one mfa configured
MobileID-Strong-Authentication · Apr 19, 2023 · a613932 · a613932
2 parents f4563e2 + f14d4a9
commit a613932
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 19 deletions.
diff --git a/Admin/register_midadfs.ps1 b/Admin/register_midadfs.ps1
@@ -8,7 +8,7 @@ $global:WarningPreference = "Continue"
 $global:ErrorActionPreference = "Continue"
 
 $shortVersion = "13"
-$fullVersion = "1.3.3.0"
+$fullVersion = "1.3.4.0"
 
 if ($Args[0] -ne $null) {
   $logFile = $Args[0];

diff --git a/AuthnAdapter/AdapterPresentation.cs b/AuthnAdapter/AdapterPresentation.cs
@@ -113,7 +113,9 @@ private string _buildErrorMessage(int lcid)
             return s;
         }
 
-        private const string loginFormCommonHtml = @"<form method=""post"" id=""midLoginForm""><input id=""context"" type=""hidden"" name=""Context"" value=""%Context%""/>";
+        private const string loginFormCommonHtml = @"<form method=""post"" id=""midLoginForm"">
+                                                        <input id=""context"" type=""hidden"" name=""Context"" value=""%Context%""/>
+                                                        <input id=""authMethod"" type=""hidden"" name=""AuthMethod"" value=""%AuthMethod%""/>";
         // The next string is documented as a required field in MSDN, but provokes "duplicated authMethod field" server error response in ADFS 3.5.
         // <input id=""authMethod"" type=""hidden"" name=""AuthMethod"" value=""%AuthMethod%""/>"  
 

diff --git a/AuthnAdapter/AuthenticationAdapter.cs b/AuthnAdapter/AuthenticationAdapter.cs
@@ -210,7 +210,9 @@ private bool isAvailableForUser(Claim identityClaim, IAuthenticationContext ctx)
             // Search for the user
             try
             {
-                using (DirectoryEntry entry = new DirectoryEntry())
+                var domain = upn.Split("@".ToCharArray())[1];
+
+                using (DirectoryEntry entry = new DirectoryEntry($"LDAP://{domain}"))
                 {
                     DirectorySearcher ds = new DirectorySearcher(entry);
                     ds.SearchScope = SearchScope.Subtree;

diff --git a/AuthnAdapter/Properties/AssemblyInfo.cs b/AuthnAdapter/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Swisscom")]
 [assembly: AssemblyProduct("Mobile ID ADFS Adapter")]
-[assembly: AssemblyCopyright("Copyright © Swisscom 2015-2021")]
+[assembly: AssemblyCopyright("Copyright © Swisscom 2015-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/Package/midadfs.iss b/Package/midadfs.iss
@@ -3,7 +3,7 @@
 #define MyAppShortName "Mobile ID for ADFS"
 #define MyAppAbb "MobileIdAdfs"
 #define MyAppVersion "1.3"
-#define MyAppFullVersion "1.3.3.0"
+#define MyAppFullVersion "1.3.4.0"
 
 [Setup]
 AppId={{609C382B-1D2D-40F5-B2ED-742C603AD024}
@@ -14,7 +14,7 @@ AppPublisherURL=https://www.swisscom.com/
 AppSupportURL=https://github.com/MobileID-Strong-Authentication/mobileid-enabler-adfs
 AppUpdatesURL=https://github.com/MobileID-Strong-Authentication/mobileid-enabler-adfs/tree/main/binaries
 ; AppUpdatesURL=http://goo.gl/cp1BCU
-AppCopyright=(C) 2015-2021, Swisscom Ltd.
+AppCopyright=(C) 2015-2023, Swisscom Ltd.
 DefaultDirName={pf}\{#MyAppAbb}\v{#MyAppVersion}
 DefaultGroupName={#MyAppName}
 LicenseFile=..\LICENSE
@@ -49,7 +49,7 @@ Source: "..\binaries\Microsoft.Diagnostics.Tracing.EventSource.dll"; DestDir: "{
 Source: "..\binaries\*.etwManifest.dll"; DestDir: "{app}\lib"; Flags: ignoreversion uninsneveruninstall
 Source: "..\binaries\*.etwManifest.man"; DestDir: "{app}\lib"; Flags: ignoreversion uninsneveruninstall
 Source: "..\AuthnAdapter\spin.min.js"; DestDir: "{app}\lib"
-Source: "..\samples\MobileId.Adfs.AuthnAdapter-template.xml"; DestDir: "{app}"; DestName: "MobileId.Adfs.AuthnAdapter.xml"
+Source: "..\samples\myconfig13.xml"; DestDir: "{app}"; DestName: "MobileId.Adfs.AuthnAdapter.xml"
 ; Source: "..\Admin\*.psm1"; DestDir: "{app}\lib"
 ; Before this script is compiled by ISCC, ..\Admin\*.psm1 are copied to ..\binaries and then signed.
 Source: "..\binaries\*.psm1"; DestDir: "{app}\lib"; Flags: ignoreversion uninsneveruninstall
@@ -65,9 +65,8 @@ Source: "..\Admin\unregister_midadfs.ps1"; DestDir: "{app}"
 Source: "..\Admin\unregister_midadfs.cmd"; DestDir: "{app}"
 Source: "..\Admin\unregister_etw.ps1"; DestDir: "{app}"; Flags: ignoreversion uninsneveruninstall
 Source: "..\Admin\unregister_etw.cmd"; DestDir: "{app}"; Flags: ignoreversion uninsneveruninstall
-Source: "..\certs\mobileid-ca-ssl.crt"; DestDir: "{app}\certs"
-Source: "..\certs\codesigning-swisscom.crt"; DestDir: "{app}\certs"
-Source: "..\certs\Swisscom_Root_CA_2_der.crt"; DestDir: "{app}\certs"
+Source: "..\certs\Swisscom_Root_CA_2.crt"; DestDir: "{app}\certs"
+Source: "..\certs\Swisscom_Root_CA_4.crt"; DestDir: "{app}\certs"
 Source: "..\3RD_PARTY.md"; DestDir: "{app}\license"
 Source: "..\LICENSE"; DestDir: "{app}\license"; DestName: "MobileId_LICENSE.txt"
 Source: "install_midadfs.cmd"; DestDir: "{app}"; Flags: deleteafterinstall

diff --git a/Package/params.txt b/Package/params.txt
@@ -1,6 +1,6 @@
 # hash-ref used to build $TOPDIR/README.md
 {
-  VersionLong  => '1.3.3.0',
+  VersionLong  => '1.3.4.0',
   VersionShort => '1.3',
   VersionAbb   => '13',
 }
diff --git a/Service/Properties/AssemblyInfo.cs b/Service/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Swisscom")]
 [assembly: AssemblyProduct("Mobile ID")]
-[assembly: AssemblyCopyright("Copyright © Swisscom 2015-2021")]
+[assembly: AssemblyCopyright("Copyright © Swisscom 2015-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/ServiceTest/Properties/AssemblyInfo.cs b/ServiceTest/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Swisscom")]
 [assembly: AssemblyProduct("ServiceTest")]
-[assembly: AssemblyCopyright("Copyright © Swisscom 2015-2021")]
+[assembly: AssemblyCopyright("Copyright © Swisscom 2015-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
diff --git a/binaries/midadfs-bin_1.3.4.0.zip b/binaries/midadfs-bin_1.3.4.0.zip
diff --git a/binaries/midadfs_setup_1.3.4.0.exe b/binaries/midadfs_setup_1.3.4.0.exe
diff --git a/release-notes.txt b/release-notes.txt
@@ -1,3 +1,6 @@
+v1.3.4.0 (2023-04-18)
+ * Inserted hidden field for AuthMethod to support more than one configured MFA methods in ADFS (github issue #15).
+
 v1.3.3.0 (2022-02-09)
  * Configuration Parameter "SslRootCaCertDN" removed
  * Renamed Configuration Parameter "SslKeystore" to "SslMidClientKeystore"