MyriAD Version 1.1.24219.0

Author: Lee Cavazos

Zephyr.Directory.Aws/Properties/AssemblyInfo.cs

@@ -9,16 +9,16 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Zephyr.Directory.Aws")]
-[assembly: AssemblyCopyright("Copyright © Guy Waguespack, 2019 - 2023")]
+[assembly: AssemblyCopyright("Copyright © Guy Waguespack, 2019 - 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.1.24150.0")]
-[assembly: AssemblyFileVersion("1.1.24150.0")]
+[assembly: AssemblyVersion("1.1.24219.0")]
+[assembly: AssemblyFileVersion("1.1.24219.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

Zephyr.Directory.Ldap/LdapServer.cs

@@ -347,13 +347,14 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                         bool Token_present = false;  
                         Token_present = CheckForToken(results, entries, nextToken_checker).Item1;
                         currentRecords = entries.Count;
+                        // Multiple Searches Request Logic for Server Token
                         if(MultipleSearches != null){
                             iteration = Pick_up_Here;
                             int recordsLeft = maxSearchResults - currentRecords;
                             if(!Token_present && recordsLeft != 0){
                                 for(int index = Pick_up_Here-1; index < MultipleSearches.Count; index++){
                                     recordsLeft = maxSearchResults - currentRecords;
-                                    // The LDAP SearchConstraints have to updated to take into consideration the entries that have been collected
+                                    // The LDAP SearchConstraints have to be updated to take into consideration the entries that have been collected
                                     LdapSearchConstraints options2 = new LdapSearchConstraints();
                                     SimplePagedResultsControl new_pagedRequestControl = new SimplePagedResultsControl(recordsLeft, nextToken);
                                     options2.SetControls(new_pagedRequestControl);
@@ -423,6 +424,7 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                                 currentRecords = entries_copy.Count;
                             }
                         }
+                        // Multiple Searches Request Logic for Client Token
                         if(MultipleSearches != null){
                             iteration = Pick_up_Here;
                             int recordsLeft = maxSearchResults - currentRecords;
@@ -473,6 +475,7 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                                 }
                             }
                             else{
+                                // Logic to help determine the next Client Based Token
                                 if(Token_present){
                                     continue_token = $"-0{Pick_up_Here}";
                                     PossibleNextToken = String.Concat((currentRecords+nextToken_client).ToString(), continue_token);

Zephyr.Directory.Ldap/Utilities/DynamoDBTools.cs

@@ -75,8 +75,8 @@ public string RegionName
             set { Region = RegionEndpoint.GetBySystemName("us-east-2"); }
         }
         public string DefaultReporter { get; set; }
-        private string RequestsTable = System.Environment.GetEnvironmentVariable("Myriad_request_table");
-        private string RecordsTable = System.Environment.GetEnvironmentVariable("Myriad_records_table");
+        private string RequestsTable = System.Environment.GetEnvironmentVariable("Myriad_Batch_Request_Table");
+        private string RecordsTable = System.Environment.GetEnvironmentVariable("Myriad_Batch_Records_Table");
         private AmazonDynamoDBClient client;
         private AmazonLambdaClient lambdaClient;
 
@@ -115,20 +115,6 @@ public void add_entry(LdapRequest request){
             var task = Request.PutItemAsync(doc);
             // Console.WriteLine(task.Result);
         }
-        public async Task<string> Invoke(string data){
-            InvokeRequest request = new InvokeRequest
-            {
-                FunctionName = "myriad-core",
-                Payload = data
-            };
-            var test = await lambdaClient.InvokeAsync(request);
-            if (test != null){
-                using (var sr = new StreamReader(test.Payload)){
-                    return await sr.ReadToEndAsync();
-                }
-            }
-            return string.Empty;  
-        }
         public LdapBatchResponse invokeLambda(LdapRequest request_obj){
             string request_body = JsonTools.Serialize(request_obj,true);
             Guid jobID_uuid = Guid.NewGuid();