Merge pull request #11 from Keyfactor/dgaley-allownullfilter

Properly handle default PageSize and SyncFilter if not in config
Keyfactor · Jan 7, 2022 · 4e3226a · 4e3226a
2 parents 1336f1a + 18a8169
commit 4e3226a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/SectigoCAProxy/Client/SectigoApiClient.cs b/src/SectigoCAProxy/Client/SectigoApiClient.cs
@@ -111,13 +111,20 @@ public async Task CertificateListProducer(BlockingCollection<Certificate> certs,
         public async Task CertificateListProducer(BlockingCollection<Certificate> certs,
                         CancellationToken cancelToken, int pageSize = 25, Dictionary<string, string[]>  filter = null)
         {
-
-            //each kvp key = type, value each filter
-            foreach (var s in filter)
-            {
-                foreach(var value in s.Value)
-                    await CertificateListProducer(certs, cancelToken, pageSize, $"{s.Key}={value}");
+            if (filter != null && filter.Count > 0)
+            {
+                //each kvp key = type, value each filter
+                foreach (var s in filter)
+                {
+                    foreach (var value in s.Value)
+                        await CertificateListProducer(certs, cancelToken, pageSize, $"{s.Key}={value}");
+                }
             }
+            else
+			{
+                // No filters
+                await CertificateListProducer(certs, cancelToken, pageSize, "");
+			}
 
             certs.CompleteAdding();
         }

diff --git a/src/SectigoCAProxy/SectigoCAProxy.cs b/src/SectigoCAProxy/SectigoCAProxy.cs
@@ -63,7 +63,11 @@ public override void Synchronize(ICertificateDataReader certificateDataReader,
             {
                 var certsToAdd = new BlockingCollection<Certificate>(100);
                 Logger.Info($"Begin Paging Certificate List");
-                //producerTask = Client.CertificateListProducer(certsToAdd, newCancelToken.Token, Config.PageSize, Config.GetSyncFilterQueryString());
+                int pageSize = 25;
+                if (Config.PageSize > 0)
+                {
+                    pageSize = Config.PageSize;
+                }
                 producerTask = Client.CertificateListProducer(certsToAdd, newCancelToken.Token, Config.PageSize, Config.SyncFilter);
 
                 foreach (Certificate certToAdd in certsToAdd.GetConsumingEnumerable())