From faa13594e0b7f9b0f5e16cc86bc3b2f7bad6dd72 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Thu, 23 Oct 2025 12:18:30 -0700 Subject: [PATCH] test: remove sensitive information' --- .../integration/DownloadManagerIntTest.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/download-manager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java b/download-manager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java index b9c9389..479102c 100644 --- a/download-manager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java +++ b/download-manager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java @@ -81,6 +81,7 @@ import ca.nrc.cadc.net.FileContent; import ca.nrc.cadc.net.HttpPost; import ca.nrc.cadc.net.NetUtil; +import ca.nrc.cadc.net.NetrcFile; import ca.nrc.cadc.reg.Standards; import ca.nrc.cadc.reg.client.LocalAuthority; import ca.nrc.cadc.reg.client.RegistryClient; @@ -96,6 +97,7 @@ import java.io.LineNumberReader; import java.io.StringReader; import java.net.MalformedURLException; +import java.net.PasswordAuthentication; import java.net.URI; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -169,10 +171,6 @@ public X509CertificateChain getCertificateChain() { // obsolete private CookiePrincipal getSSOCookie() { - Map params = new TreeMap<>(); - params.put("username", "cadcregtest1"); - params.put("password", "qS1U42Y"); - LocalAuthority localAuthority = new LocalAuthority(); URI serviceURI = localAuthority.getResourceID(Standards.UMS_LOGIN_10); log.debug("login uri: " + serviceURI.toString()); @@ -180,7 +178,7 @@ private CookiePrincipal getSSOCookie() { log.debug("login url: " + url.toExternalForm()); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - HttpPost login = new HttpPost(url, params, bos); + HttpPost login = new HttpPost(url, loginParameters(url), bos); login.run(); if (login.getThrowable() != null) { throw new RuntimeException("login failed: " + login.getResponseCode(), login.getThrowable()); @@ -191,6 +189,21 @@ private CookiePrincipal getSSOCookie() { }); } + private Map loginParameters(final URL loginURL) { + final NetrcFile netrcFile = new NetrcFile(); + final PasswordAuthentication passwordAuthentication = netrcFile.getCredentials(loginURL.getHost(), false); + + if (passwordAuthentication == null) { + throw new RuntimeException("No credentials found for " + loginURL.getHost() + " in .netrc."); + } + + final Map params = new TreeMap<>(); + params.put("username", passwordAuthentication.getUserName()); + params.put("password", new String(passwordAuthentication.getPassword())); + + return params; + } + private URL getTargetURL() throws Exception { final String configuredURL = System.getenv("DOWNLOAD_MANAGER_TEST_URL"); final URL serviceURL;