diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-05-06 11:42:04 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-05-06 11:42:04 +0000 |
| commit | 6b40d051f8325ea957e60fc37abe26e97c5de2b6 (patch) | |
| tree | f64e2d51b783c339609958de8af3564ecc92e632 /lib/license/management/shell.rb | |
| parent | 8e427c7987e90a028e6d9f344a9f70bb13b6eee4 (diff) | |
| parent | b963d8d572fdf93d9c76e45d400465d8c5c2fae0 (diff) | |
Merge branch '212921-offline-npm' into 'master'v3.8.0
Specify a custom CA for npm
See merge request gitlab-org/security-products/license-management!145
Diffstat (limited to 'lib/license/management/shell.rb')
| -rw-r--r-- | lib/license/management/shell.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb index 9ff59c4..9053a3f 100644 --- a/lib/license/management/shell.rb +++ b/lib/license/management/shell.rb @@ -48,6 +48,7 @@ module License Dir.glob('custom.*.crt').each do |path| full_path = File.expand_path(path) execute([:openssl, :x509, '-in', full_path, '-text', '-noout']) + keystore_path = "#{ENV['JAVA_HOME']}/jre/lib/security/cacerts" execute([ :keytool, '-importcert', @@ -56,9 +57,13 @@ module License '-trustcacerts', '-noprompt', '-storepass', 'changeit', - '-keystore', "#{ENV['JAVA_HOME']}/jre/lib/security/cacerts" + '-keystore', keystore_path + ]) + execute([ + :keytool, '-list', '-v', + '-storepass changeit', + '-keystore', keystore_path ]) - execute(["keytool -list -v -storepass changeit"]) end end end |