Merge branch '217905-net-integration-test' into 'master'v3.18.0

Resolve nuget dependencies from a custom registry.

See merge request gitlab-org/security-products/license-management!189

3 files changed, 23 insertions, 1 deletions

diff --git a/lib/license/management/nuspec.rb b/lib/license/management/nuspec.rb
new file mode 100644
index 0000000..cd785b4
--- /dev/null
+++ b/lib/license/management/nuspec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module License
+  module Management
+    class Nuspec
+      attr_reader :xml
+
+      def initialize(xml)
+        @xml = REXML::Document.new(xml)
+      end
+
+      def licenses
+        licenses = REXML::XPath.match(xml, "//package/metadata/license[@type='expression']").map(&:get_text).map(&:to_s)
+        return licenses if licenses.any?
+
+        REXML::XPath.match(xml, '//package/metadata/licenseUrl').map(&:get_text).map(&:to_s)
+      end
+    end
+  end
+end
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index 2bdd95a..408c760 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -49,6 +49,8 @@ module License
             execute(keytool_list_command)
           end
         end
+        execute([:cp, custom_certificate_path.to_s, "/usr/lib/ssl/certs/"])
+        execute([:c_rehash, '-v'])
       end
 
       def keytool_import_command(file_path)
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 76b9238..cd8bbd5 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.17.2'
+    VERSION = '3.18.0'
   end
 end