From 0a25f69a4bb7791c8bc61d7d036247219c5d6681 Mon Sep 17 00:00:00 2001 From: Lee Fine <50836957+leefine02@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:30:05 -0400 Subject: [PATCH] Token auth bug fixes (#35) Fixes ab#46603 fixes ab#46175 * Add license headers --------- Co-authored-by: Keyfactor Co-authored-by: kfadmin Co-authored-by: Michael Henderson --- Bundle/Discovery.cs | 11 ++++++++++- Bundle/Inventory.cs | 11 ++++++++++- Bundle/Management.cs | 14 +++++++++++--- CHANGELOG.md | 4 ++++ DiscoveryBase.cs | 9 +++++++++ F5Client.cs | 14 ++++++++++++-- F5DataModels.cs | 9 +++++++++ F5JobBase.cs | 9 +++++++++ F5Orchestrator.csproj | 6 +++--- InventoryBase.cs | 9 +++++++++ ManagementBase.cs | 11 ++++++++++- README.md | 10 +++++++++- RESTHandler.cs | 11 ++++++++++- SSLProfile/Discovery.cs | 11 ++++++++++- SSLProfile/Inventory.cs | 11 ++++++++++- SSLProfile/Management.cs | 14 +++++++++++--- Utilities.cs | 9 +++++++++ WebServer/Inventory.cs | 11 ++++++++++- WebServer/Management.cs | 14 +++++++++++--- license.tmp.txt | 16 ++++++++++++++++ tmp.txt | 16 ++++++++++++++++ todo.tmp.txt | 0 22 files changed, 208 insertions(+), 22 deletions(-) create mode 100644 license.tmp.txt create mode 100644 tmp.txt create mode 100644 todo.tmp.txt diff --git a/Bundle/Discovery.cs b/Bundle/Discovery.cs index eae8988..6f2ebf5 100644 --- a/Bundle/Discovery.cs +++ b/Bundle/Discovery.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -30,7 +39,7 @@ public override JobResult ProcessJob(DiscoveryJobConfiguration config, SubmitDis LogHandlerCommon.Debug(logger, certificateStore, "Getting partitions"); SetPAMSecrets(config.ServerUsername, config.ServerPassword, logger); - F5Client f5 = new F5Client(certificateStore, ServerUserName, ServerPassword, config.UseSSL, string.Empty, new List()) { IgnoreSSLWarning = true }; + F5Client f5 = new F5Client(certificateStore, ServerUserName, ServerPassword, config.UseSSL, string.Empty, true, new List()); List partitions = f5.GetPartitions().Select(p => p.name).ToList(); LogHandlerCommon.Trace(logger, certificateStore, $"Found {partitions?.Count} partitions"); diff --git a/Bundle/Inventory.cs b/Bundle/Inventory.cs index 2931291..b5f5b5f 100644 --- a/Bundle/Inventory.cs +++ b/Bundle/Inventory.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -31,7 +40,7 @@ public override JobResult ProcessJob(InventoryJobConfiguration config, SubmitInv { base.ParseJobProperties(); SetPAMSecrets(config.ServerUsername, config.ServerPassword, logger); - F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, null, config.LastInventory) { F5Version = base.F5Version, IgnoreSSLWarning = base.IgnoreSSLWarning }; + F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, null, IgnoreSSLWarning, config.LastInventory) { F5Version = base.F5Version }; LogHandlerCommon.Debug(logger, JobConfig.CertificateStoreDetails, $"Getting inventory for CA Bundle '{config.CertificateStoreDetails.StorePath}'"); inventory = f5.GetCABundleInventory(); diff --git a/Bundle/Management.cs b/Bundle/Management.cs index 645f4c0..ebda49c 100644 --- a/Bundle/Management.cs +++ b/Bundle/Management.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -39,11 +48,10 @@ public override JobResult ProcessJob(ManagementJobConfiguration config) base.ParseJobProperties(); base.PrimaryNodeActive(); - F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, config.JobCertificate.PrivateKeyPassword, config.LastInventory) + F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, config.JobCertificate.PrivateKeyPassword, IgnoreSSLWarning, config.LastInventory) { PrimaryNode = base.PrimaryNode, - F5Version = base.F5Version, - IgnoreSSLWarning = base.IgnoreSSLWarning + F5Version = base.F5Version }; switch (config.OperationType) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e60fc3..2c651b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +v1.4.1 +- Bug Fix: IgnoreSSLWarning was not recognized when set to true +- Modified login API call for token auth to fix issue some users were experiencing + v1.4 - Modified authentication for API calls from Basic to Token Auth. Initial login uses id/password to retrieve temporary access token, so the same id/password credentials are still required for the certificate store, but all subsequent API calls will use the token retrieved on initial login. - Added PAM Support diff --git a/DiscoveryBase.cs b/DiscoveryBase.cs index 1cf19ed..1a3049e 100644 --- a/DiscoveryBase.cs +++ b/DiscoveryBase.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Orchestrators.Extensions; using Microsoft.Extensions.Logging; using System.Collections.Generic; diff --git a/F5Client.cs b/F5Client.cs index 4a64b2e..1cfad32 100644 --- a/F5Client.cs +++ b/F5Client.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; using Keyfactor.PKI.X509; @@ -43,13 +52,14 @@ internal class F5Client #region Constructors - public F5Client(CertificateStore certificateStore, string serverUserName, string serverPassword, bool useSSL, string pfxPassword, IEnumerable inventory) + public F5Client(CertificateStore certificateStore, string serverUserName, string serverPassword, bool useSSL, string pfxPassword, bool ignoreSSLWarning, IEnumerable inventory) { CertificateStore = certificateStore; ServerUserName = serverUserName; ServerPassword = serverPassword; UseSSL = useSSL; PFXPassword = pfxPassword; + IgnoreSSLWarning = ignoreSSLWarning; Inventory = inventory; if (logger == null) @@ -692,7 +702,7 @@ public List GetSSLProfiles(int pageSize) private string GetToken(string userName, string userPassword) { LogHandlerCommon.MethodEntry(logger, CertificateStore, "GetToken"); - F5LoginRequest request = new F5LoginRequest() { username = userName, password = userPassword }; + F5LoginRequest request = new F5LoginRequest() { username = userName, password = userPassword, loginProviderName = "tmos" }; F5LoginResponse loginResponse = REST.Post($"/mgmt/shared/authn/login", JsonConvert.SerializeObject(request)); LogHandlerCommon.MethodExit(logger, CertificateStore, "GetToken"); diff --git a/F5DataModels.cs b/F5DataModels.cs index 2693d27..753da1a 100644 --- a/F5DataModels.cs +++ b/F5DataModels.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using System; using System.Collections.Generic; using System.Linq; diff --git a/F5JobBase.cs b/F5JobBase.cs index b661f53..df7edcf 100644 --- a/F5JobBase.cs +++ b/F5JobBase.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Orchestrators.Extensions.Interfaces; using Microsoft.Extensions.Logging; using System; diff --git a/F5Orchestrator.csproj b/F5Orchestrator.csproj index 181e9ae..b1d7ec2 100644 --- a/F5Orchestrator.csproj +++ b/F5Orchestrator.csproj @@ -4,9 +4,9 @@ false netcoreapp3.1 true - 12.0 - 11.0.0.0 - 12.0.0.0 + 13.3 + 13.3.0.0 + 13.3.0.0 diff --git a/InventoryBase.cs b/InventoryBase.cs index 929d5b3..6ee7972 100644 --- a/InventoryBase.cs +++ b/InventoryBase.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Microsoft.Extensions.Logging; diff --git a/ManagementBase.cs b/ManagementBase.cs index 0d643ab..20d9f3a 100644 --- a/ManagementBase.cs +++ b/ManagementBase.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Orchestrators.Extensions; using Microsoft.Extensions.Logging; using Newtonsoft.Json; @@ -82,7 +91,7 @@ protected void PrimaryNodeActive() if (PrimaryNodeOnlineRequired) { - F5Client f5 = new F5Client(JobConfig.CertificateStoreDetails, ServerUserName, ServerPassword, JobConfig.UseSSL, JobConfig.JobCertificate.PrivateKeyPassword, JobConfig.LastInventory) + F5Client f5 = new F5Client(JobConfig.CertificateStoreDetails, ServerUserName, ServerPassword, JobConfig.UseSSL, JobConfig.JobCertificate.PrivateKeyPassword, IgnoreSSLWarning, JobConfig.LastInventory) { PrimaryNode = this.PrimaryNode }; if (!f5.PrimaryNodeActive()) { diff --git a/README.md b/README.md index ddca61e..29ceec6 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ The F5 Orchestrator allows for the remote management of F5 Stores. Discovery, In #### Integration status: Production - Ready for use in production environments. + ## About the Keyfactor Universal Orchestrator Extension This repository contains a Universal Orchestrator Extension which is a plugin to the Keyfactor Universal Orchestrator. Within the Keyfactor Platform, Orchestrators are used to manage “certificate stores” — collections of certificates and roots of trust that are found within and used by various applications. @@ -14,12 +15,12 @@ The Universal Orchestrator is the successor to the Windows Orchestrator. This Or + ## Support for F5 F5 is supported by Keyfactor for Keyfactor customers. If you have a support issue, please open a support ticket with your Keyfactor representative. ###### To report a problem or suggest a new feature, use the **[Issues](../../issues)** tab. If you want to contribute actual bug fixes or proposed enhancements, use the **[Pull requests](../../pulls)** tab. -___ @@ -61,6 +62,11 @@ It is not necessary to use a PAM Provider for all of the secrets available above If a PAM Provider will be used for one of the fields above, start by referencing the [Keyfactor Integration Catalog](https://keyfactor.github.io/integrations-catalog/content/pam). The GitHub repo for the PAM Provider to be used contains important information such as the format of the `json` needed. What follows is an example but does not reflect the `json` values for all PAM Providers as they have different "instance" and "initialization" parameter names and values. +
General PAM Provider Configuration +

+ + + ### Example PAM Provider Setup To use a PAM Provider to resolve a field, in this example the __Server Password__ will be resolved by the `Hashicorp-Vault` provider, first install the PAM Provider extension from the [Keyfactor Integration Catalog](https://keyfactor.github.io/integrations-catalog/content/pam) on the Universal Orchestrator. @@ -87,6 +93,8 @@ To have the __Server Password__ field resolved by the `Hashicorp-Vault` provider ~~~ This text would be entered in as the value for the __Server Password__, instead of entering in the actual password. The Orchestrator will attempt to use the PAM Provider to retrieve the __Server Password__. If PAM should not be used, just directly enter in the value for the field. +

+
diff --git a/RESTHandler.cs b/RESTHandler.cs index b8c504b..7ac681a 100644 --- a/RESTHandler.cs +++ b/RESTHandler.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using System; using System.Collections.Generic; using System.Linq; @@ -300,7 +309,7 @@ private HttpClientHandler GetHttpClientHandler() { HttpClientHandler handler = new HttpClientHandler(); if (IgnoreSSLWarning) { handler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; }; } - + return handler; } } diff --git a/SSLProfile/Discovery.cs b/SSLProfile/Discovery.cs index ed90bd3..3d00a32 100644 --- a/SSLProfile/Discovery.cs +++ b/SSLProfile/Discovery.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -31,7 +40,7 @@ public override JobResult ProcessJob(DiscoveryJobConfiguration config, SubmitDis SetPAMSecrets(config.ServerUsername, config.ServerPassword, logger); - F5Client f5 = new F5Client(certificateStore, ServerUserName, ServerPassword, config.UseSSL, string.Empty, new List()) { IgnoreSSLWarning = true }; + F5Client f5 = new F5Client(certificateStore, ServerUserName, ServerPassword, config.UseSSL, string.Empty, true, new List()); List locations = f5.GetPartitions().Select(p => p.name).ToList(); LogHandlerCommon.Debug(logger, certificateStore, $"Submitting {locations?.Count} partitions"); diff --git a/SSLProfile/Inventory.cs b/SSLProfile/Inventory.cs index 5bcb5c1..5a8dbe5 100644 --- a/SSLProfile/Inventory.cs +++ b/SSLProfile/Inventory.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -31,7 +40,7 @@ public override JobResult ProcessJob(InventoryJobConfiguration config, SubmitInv { base.ParseJobProperties(); SetPAMSecrets(config.ServerUsername, config.ServerPassword, logger); - F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, null, config.LastInventory) { F5Version = base.F5Version, IgnoreSSLWarning = base.IgnoreSSLWarning }; + F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, null, IgnoreSSLWarning, config.LastInventory) { F5Version = base.F5Version }; LogHandlerCommon.Debug(logger, JobConfig.CertificateStoreDetails, $"Getting inventory from '{config.CertificateStoreDetails.StorePath}'"); inventory = f5.GetSSLProfiles(20); diff --git a/SSLProfile/Management.cs b/SSLProfile/Management.cs index b39cea6..bf38574 100644 --- a/SSLProfile/Management.cs +++ b/SSLProfile/Management.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -38,11 +47,10 @@ public override JobResult ProcessJob(ManagementJobConfiguration config) base.ParseJobProperties(); base.PrimaryNodeActive(); - F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, config.JobCertificate.PrivateKeyPassword, config.LastInventory) + F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, config.JobCertificate.PrivateKeyPassword, IgnoreSSLWarning, config.LastInventory) { PrimaryNode = base.PrimaryNode, - F5Version = base.F5Version, - IgnoreSSLWarning = base.IgnoreSSLWarning + F5Version = base.F5Version }; switch (config.OperationType) diff --git a/Utilities.cs b/Utilities.cs index 0c25375..aaa4b87 100644 --- a/Utilities.cs +++ b/Utilities.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Microsoft.Extensions.Logging; diff --git a/WebServer/Inventory.cs b/WebServer/Inventory.cs index 8711010..f06f0ea 100644 --- a/WebServer/Inventory.cs +++ b/WebServer/Inventory.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -34,7 +43,7 @@ public override JobResult ProcessJob(InventoryJobConfiguration config, SubmitInv dynamic properties = JsonConvert.DeserializeObject(config.CertificateStoreDetails.Properties.ToString()); SetPAMSecrets(config.ServerUsername, config.ServerPassword, logger); - F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, null, config.LastInventory) { IgnoreSSLWarning = base.IgnoreSSLWarning }; + F5Client f5 = new F5Client(config.CertificateStoreDetails, ServerUserName, ServerPassword, config.UseSSL, null, IgnoreSSLWarning, config.LastInventory); LogHandlerCommon.Debug(logger, JobConfig.CertificateStoreDetails, "Getting the F5 web server device inventory"); inventory = f5.GetWebServerInventory(); diff --git a/WebServer/Management.cs b/WebServer/Management.cs index 046b29a..c6e42a2 100644 --- a/WebServer/Management.cs +++ b/WebServer/Management.cs @@ -1,3 +1,12 @@ +// Copyright 2023 Keyfactor +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain a +// copy of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +// required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +// OR CONDITIONS OF ANY KIND, either express or implied. See the License for +// thespecific language governing permissions and limitations under the +// License. using Keyfactor.Logging; using Keyfactor.Orchestrators.Extensions; using Keyfactor.Orchestrators.Common.Enums; @@ -38,10 +47,9 @@ public override JobResult ProcessJob(ManagementJobConfiguration config) base.ParseJobProperties(); base.PrimaryNodeActive(); - F5Client f5 = new F5Client(JobConfig.CertificateStoreDetails, ServerUserName, ServerPassword, JobConfig.UseSSL, JobConfig.JobCertificate.PrivateKeyPassword, JobConfig.LastInventory) + F5Client f5 = new F5Client(JobConfig.CertificateStoreDetails, ServerUserName, ServerPassword, JobConfig.UseSSL, JobConfig.JobCertificate.PrivateKeyPassword, IgnoreSSLWarning, JobConfig.LastInventory) { - PrimaryNode = base.PrimaryNode, - IgnoreSSLWarning = base.IgnoreSSLWarning + PrimaryNode = base.PrimaryNode }; LogHandlerCommon.Trace(logger, config.CertificateStoreDetails, "Replacing F5 web server certificate"); diff --git a/license.tmp.txt b/license.tmp.txt new file mode 100644 index 0000000..1196c87 --- /dev/null +++ b/license.tmp.txt @@ -0,0 +1,16 @@ +./Bundle/Discovery.cs +./Bundle/Inventory.cs +./Bundle/Management.cs +./DiscoveryBase.cs +./F5Client.cs +./F5DataModels.cs +./F5JobBase.cs +./InventoryBase.cs +./ManagementBase.cs +./RESTHandler.cs +./SSLProfile/Discovery.cs +./SSLProfile/Inventory.cs +./SSLProfile/Management.cs +./Utilities.cs +./WebServer/Inventory.cs +./WebServer/Management.cs diff --git a/tmp.txt b/tmp.txt new file mode 100644 index 0000000..1196c87 --- /dev/null +++ b/tmp.txt @@ -0,0 +1,16 @@ +./Bundle/Discovery.cs +./Bundle/Inventory.cs +./Bundle/Management.cs +./DiscoveryBase.cs +./F5Client.cs +./F5DataModels.cs +./F5JobBase.cs +./InventoryBase.cs +./ManagementBase.cs +./RESTHandler.cs +./SSLProfile/Discovery.cs +./SSLProfile/Inventory.cs +./SSLProfile/Management.cs +./Utilities.cs +./WebServer/Inventory.cs +./WebServer/Management.cs diff --git a/todo.tmp.txt b/todo.tmp.txt new file mode 100644 index 0000000..e69de29