(whimsy) branch master updated: Use env to pass credentials

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new ea3067cb Use env to pass credentials
ea3067cb is described below

commit ea3067cbbf5deec4a96ebf79f388113174e5b399
Author: Sebb <s...@apache.org>
AuthorDate: Sun Feb 18 23:47:27 2024 +0000

    Use env to pass credentials
---
 www/secretary/workbench/views/actions/check-signature.json.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/www/secretary/workbench/views/actions/check-signature.json.rb 
b/www/secretary/workbench/views/actions/check-signature.json.rb
index 823284e3..935b751b 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -112,11 +112,10 @@ def validate_sig(attachment, signature, msgid)
           if err.include? 'imported: 1' # downloaded key is valid; store it 
for posterity
             Dir.mktmpdir do |tmpdir|
               container = ASF::SVN.svnpath!('iclas', '__keys__')
-              ASF::SVN.svn!('checkout',[container, tmpdir],
-                            {depth: 'empty', user: $USER, password: $PASSWORD})
+              ASF::SVN.svn!('checkout',[container, tmpdir], {depth: 'empty', 
env: env})
               outfile = File.join(tmpdir, keyid)
               # Just in case we already have a copy
-              ASF::SVN.svn!('update', outfile, {user: $USER, password: 
$PASSWORD})
+              ASF::SVN.svn!('update', outfile, {env: env})
               present = File.exist? outfile
               FileUtils.cp(tmpfile, outfile) # add the latest copy
               if present # must have been dropped from the pubkey database (or 
was maybe backfilled)
@@ -126,7 +125,7 @@ def validate_sig(attachment, signature, msgid)
               else # we have a new key
                 ASF::SVN.svn!('add', outfile, {verbose: true})
               end
-              ASF::SVN.svn!('commit', outfile, {msg: "Adding key for msgid: 
#{msgid}", user: $USER, password: $PASSWORD})
+              ASF::SVN.svn!('commit', outfile, {msg: "Adding key for msgid: 
#{msgid}", env: env})
             end
           else
             Wunderbar.warn "Failed to import #{keyid}"