Changeset 402 for binary-improvements2/WebServer/src/OpenID.cs

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

File:

• binary-improvements2/WebServer/src/OpenID.cs (modified) (12 diffs)

binary-improvements2/WebServer/src/OpenID.cs

@@ -19 +19 @@
 
                 private static readonly X509Certificate2 caCert =
-                        new X509Certificate2 (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) +
-                                              "/steam-rootca.cer");
+                        new X509Certificate2 ($"{Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location)}/steam-rootca.cer");
 
                 private static readonly X509Certificate2 caIntermediateCert =
-                        new X509Certificate2 (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) +
-                                              "/steam-intermediate.cer");
+                        new X509Certificate2 ($"{Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location)}/steam-intermediate.cer");
 
                 private const bool verboseSsl = false;
@@ -74 +72 @@
                                 foreach (X509ChainElement chainEl in privateChain.ChainElements) {
                                         if (verboseSsl) {
-                                                Log.Out ("Validating cert: " + chainEl.Certificate.Subject);
+                                                Log.Out ($"Validating cert: {chainEl.Certificate.Subject}");
                                         }
 
@@ -80 +78 @@
                                         foreach (X509ChainStatus chainStatus in chainEl.ChainElementStatus) {
                                                 if (verboseSsl) {
-                                                        Log.Out ("   Status: " + chainStatus.Status);
+                                                        Log.Out ($"   Status: {chainStatus.Status}");
                                                 }
 
@@ -94 +92 @@
 
                                                 // This status is an error, print information
-                                                Log.Warning ("[OpenID] Steam certificate error: " + chainEl.Certificate.Subject + " ### Error: " +
-                                                             chainStatus.Status);
+                                                Log.Warning ($"[OpenID] Steam certificate error: {chainEl.Certificate.Subject} ### Error: {chainStatus.Status}");
                                                 privateChain.Reset ();
                                                 return false;
@@ -104 +101 @@
                                         if (chainStatus.Status != X509ChainStatusFlags.NoError &&
                                             chainStatus.Status != X509ChainStatusFlags.UntrustedRoot) {
-                                                Log.Warning ("[OpenID] Steam certificate error: " + chainStatus.Status);
+                                                Log.Warning ($"[OpenID] Steam certificate error: {chainStatus.Status}");
                                                 privateChain.Reset ();
                                                 return false;
@@ -130 +127 @@
                         };
 
-                        return STEAM_LOGIN + '?' + buildUrlParams (queryParams);
+                        return $"{STEAM_LOGIN}?{buildUrlParams (queryParams)}";
                 }
 
@@ -141 +138 @@
 
                         if (mode == "error") {
-                                Log.Warning ("[OpenID] Steam OpenID login error: " + getValue (_req, "openid.error"));
+                                Log.Warning ($"[OpenID] Steam OpenID login error: {getValue (_req, "openid.error")}");
                                 if (debugOpenId) {
                                         PrintOpenIdResponse (_req);
@@ -174 +171 @@
                         string[] signeds = getValue (_req, "openid.signed").Split (',');
                         foreach (string s in signeds) {
-                                queryParams ["openid." + s] = getValue (_req, "openid." + s);
+                                string name = $"openid.{s}";
+                                queryParams [name] = getValue (_req, name);
                         }
 
@@ -201 +199 @@
                         }
 
-                        Log.Warning ("[OpenID] Steam OpenID login failed: {0}", responseString);
+                        Log.Warning ($"[OpenID] Steam OpenID login failed: {responseString}");
                         return 0;
                 }
@@ -209 +207 @@
                         int i = 0;
                         foreach ((string argName, string argValue) in _queryParams) {
-                                paramsArr [i++] = argName + "=" + Uri.EscapeDataString (argValue);
+                                paramsArr [i++] = $"{argName}={Uri.EscapeDataString (argValue)}";
                         }
 
@@ -218 +216 @@
                         NameValueCollection nvc = _req.QueryString;
                         if (nvc [_name] == null) {
-                                throw new MissingMemberException ("[OpenID] OpenID parameter \"" + _name + "\" missing");
+                                throw new MissingMemberException ($"[OpenID] OpenID parameter \"{_name}\" missing");
                         }
 
@@ -227 +225 @@
                         NameValueCollection nvc = _req.QueryString;
                         for (int i = 0; i < nvc.Count; i++) {
-                                Log.Out ("   " + nvc.GetKey (i) + " = " + nvc [i]);
+                                Log.Out ($"   {nvc.GetKey (i)} = {nvc [i]}");
                         }
                 }