Merge pull request #12 from nizanrosh/fix/bugs

bug fixes
nizanrosh · Jan 2, 2023 · dad988e · dad988e
2 parents c52db11 + 29133d4
commit dad988e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>1.3.0</VersionPrefix>
+    <VersionPrefix>1.3.1</VersionPrefix>
     <LangVersion>latest</LangVersion>
 
     <Authors>Nizan Rosh</Authors>

diff --git a/src/main/Okta.Aws.Cli/Cli/RunArgumentHandler.cs b/src/main/Okta.Aws.Cli/Cli/RunArgumentHandler.cs
@@ -24,6 +24,7 @@ protected override async Task HandleInternal(string[] args, CancellationToken ca
         _userSettingsHandler.SanityCheck();
         await _assumeRoleService.RunAsync(cancellationToken);
 
+        Console.ResetColor();
         Console.WriteLine();
         Console.WriteLine(FiggleFonts.Standard.Render("Goodbye"));
     }

diff --git a/src/main/Okta.Aws.Cli/Encryption/AesOperation.cs b/src/main/Okta.Aws.Cli/Encryption/AesOperation.cs
@@ -72,12 +72,13 @@ public static string GetKeyByMachine()
         var machineName = Environment.MachineName;
 
         var key = $"{user}_{processorCount}_{machineName}";
+        if (key.Length == 32) return key;
         if (key.Length < 32)
         {
             key = key.PadRight(32, '0');
             return key;
         }
 
-        return key.Take(32).ToString()!;
+        return key.Substring(0, 32);
     }
 }
diff --git a/src/main/Okta.Aws.Cli/Okta/OktaApiClient.cs b/src/main/Okta.Aws.Cli/Okta/OktaApiClient.cs
@@ -39,7 +39,7 @@ public async Task<string> GetSamlHtml(string sessionToken, CancellationToken can
             var userSettings = _configuration.GetSection(nameof(UserSettings)).Get<UserSettings>();
 
             var sessionId = await GetSessionId(sessionToken, userSettings.OktaDomain!, cancellationToken);
-            var appUrl = string.IsNullOrEmpty(userSettings.AppUrl) ? await GetAppUrl(sessionId, cancellationToken) : userSettings.AppUrl;
+            var appUrl = IsAppUrlValid(userSettings.AppUrl) ? userSettings.AppUrl : await GetAppUrl(sessionId, cancellationToken);
             ArgumentNullException.ThrowIfNull(appUrl, nameof(appUrl));
 
             var html = await GetHtml(sessionId, userSettings.OktaDomain!, appUrl, cancellationToken);
@@ -94,4 +94,13 @@ private async Task<string> GetHtml(string sessionId, string oktaDomain, string a
         var html = await awsResponse.Content.ReadAsStringAsync(cancellationToken);
         return html;
     }
+
+    private bool IsAppUrlValid(string? appUrl)
+    {
+        if (string.IsNullOrEmpty(appUrl)) return false;
+
+        if (Uri.TryCreate(appUrl, UriKind.Absolute, out _) == false) return false;
+
+        return true;
+    }
 }