add gitlab and github token Auth support #14

src/main/java/com/diffplug/blowdryer/Blowdryer.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.MalformedURLException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
@@ -132,7 +133,7 @@ private static Map<String, String> loadPropertyFile(File file) throws IOExceptio
 
 	private static void download(String url, File dst) throws IOException {
 		OkHttpClient client = new OkHttpClient.Builder().build();
-		Request req = new Request.Builder().url(url).build();
+		Request req = authPlugin.addAuthToken(url, new Request.Builder().url(url)).build();
 		try (Response response = client.newCall(req).execute()) {
 			if (!response.isSuccessful()) {
 				throw new IllegalArgumentException(url + "\nreceived http code " + response.code() + "\n" + response.body().string());
@@ -204,6 +205,19 @@ private static void assertInitialized() {
 		}
 	}
 
+	static interface AuthPlugin {
+		Request.Builder addAuthToken(String url, Request.Builder builder) throws MalformedURLException;
+	}
+
+	private static final AuthPlugin authPluginNone = (url, builder) -> builder;;
+	private static AuthPlugin authPlugin = authPluginNone;
+
+	public static void setAuthPlugin(AuthPlugin authPlugin) {
+		synchronized (Blowdryer.class) {
+			Blowdryer.authPlugin = authPlugin == null ? authPluginNone : authPlugin;
+		}
+	}
+
 	/** Returns the given resource as a File (as configured by {@link BlowdryerSetup}. */
 	public static File file(String resourcePath) {
 		synchronized (Blowdryer.class) {

src/main/java/com/diffplug/blowdryer/BlowdryerSetup.java

@@ -19,13 +19,20 @@
 import com.diffplug.common.base.Errors;
 import groovy.lang.Closure;
 import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Objects;
 import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 /** Configures where {@link Blowdryer#file(String)} downloads files from. */
 public class BlowdryerSetup {
 	static final String NAME = "blowdryerSetup";
 
+	private static final String GITHUB_HOST = "raw.githubusercontent.com";
+	private static final String GITLAB_HOST = "gitlab.com";
+
 	private final File referenceDirectory;
 
 	/** Pass in the directory that will be used to resolve string arguments to devLocal. */
@@ -54,19 +61,102 @@ public enum GitAnchorType {
 	}
 
 	/** Sets the source where we will grab these scripts. */
-	public void github(String repoOrg, GitAnchorType anchorType, String anchor) {
-		assertNoLeadingOrTrailingSlash(repoOrg);
-		assertNoLeadingOrTrailingSlash(anchor);
-		String root = "https://raw.githubusercontent.com/" + repoOrg + "/" + anchor + "/" + repoSubfolder + "/";
-		Blowdryer.setResourcePlugin(resource -> root + resource);
+	public GitHub github(String repoOrg, GitAnchorType anchorType, String anchor) {
+		// anchorType isn't used right now, but makes it easier to read what "anchor" is
+		return new GitHub(repoOrg, anchor);
+	}
+
+	public class GitHub {
+		private String repoOrg;
+		private String anchor;
+		private @Nullable String authToken;
+
+		private GitHub(String repoOrg, String anchor) {
+			this.repoOrg = assertNoLeadingOrTrailingSlash(repoOrg);
+			this.anchor = assertNoLeadingOrTrailingSlash(anchor);
+			setGlobals();
+		}
+
+		public GitHub authToken(String authToken) {
+			this.authToken = authToken;
+			return setGlobals();
+		}
+
+		private GitHub setGlobals() {
+			String root = "https://" + GITHUB_HOST + "/" + repoOrg + "/" + anchor + "/";
+			Blowdryer.setResourcePlugin(resource -> root + getFullResourcePath(resource));
+			if (authToken != null) {
+				Blowdryer.setAuthPlugin((url, builder) -> {
+					if (url.startsWith(root)) {
+						builder.addHeader("Authorization", "Bearer " + authToken);
+					}
+					return builder;
+				});
+			} else {
+				Blowdryer.setAuthPlugin(null);
+			}
+			return this;
+		}
 	}
 
 	/** Sets the source where we will grab these scripts. */
-	public void gitlab(String repoOrg, GitAnchorType anchorType, String anchor) {
-		assertNoLeadingOrTrailingSlash(repoOrg);
-		assertNoLeadingOrTrailingSlash(anchor);
-		String root = "https://gitlab.com/" + repoOrg + "/-/raw/" + anchor + "/" + repoSubfolder + "/";
-		Blowdryer.setResourcePlugin(resource -> root + resource);
+	public GitLab gitlab(String repoOrg, GitAnchorType anchorType, String anchor) {
+		// anchorType isn't used right now, but makes it easier to read what "anchor" is
+		return new GitLab(repoOrg, anchor);
+	}
+
+	public class GitLab {
+		private String repoOrg;
+		private String anchor;
+		private @Nullable String authToken;
+		private String protocol, host;
+
+		private GitLab(String repoOrg, String anchor) {
+			this.repoOrg = assertNoLeadingOrTrailingSlash(repoOrg);
+			this.anchor = assertNoLeadingOrTrailingSlash(anchor);
+			customDomainHttps(GITLAB_HOST);
+		}
+
+		public GitLab authToken(String authToken) {
+			this.authToken = authToken;
+			return setGlobals();
+		}
+
+		public GitLab customDomainHttp(String domain) {
+			return customProtocolAndDomain("http://", domain);
+		}
+
+		public GitLab customDomainHttps(String domain) {
+			return customProtocolAndDomain("https://", domain);
+		}
+
+		private GitLab customProtocolAndDomain(String protocol, String domain) {
+			this.protocol = protocol;
+			this.host = domain;
+			return setGlobals();
+		}
+
+		private GitLab setGlobals() {
+			String urlStart = protocol + host + "/api/v4/projects/" + encodeUrlPart(repoOrg) + "/repository/files/";
+			String urlEnd = "/raw?ref=" + encodeUrlPart(anchor);
+			Blowdryer.setResourcePlugin(resource -> urlStart + encodeUrlPart(getFullResourcePath(resource)) + urlEnd);
+			if (authToken != null) {
+				Blowdryer.setAuthPlugin((url, builder) -> {
+					if (url.startsWith(urlStart)) {
+						builder.addHeader("Authorization", "Bearer " + authToken);
+					}
+					return builder;
+				});
+			} else {
+				Blowdryer.setAuthPlugin(null);
+			}
+			return this;
+		}
+	}
+
+	@NotNull
+	private String getFullResourcePath(String resource) {
+		return (repoSubfolder.isEmpty() ? "" : repoSubfolder + "/") + resource;
 	}
 
 	/** Sets the mapping from `file(String)` to `immutableUrl(String)`. */
@@ -108,4 +198,12 @@ private static String assertNoLeadingOrTrailingSlash(String input) {
 		}
 		return input;
 	}
+
+	private static String encodeUrlPart(String part) {
+		try {
+			return URLEncoder.encode(part, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			throw new IllegalArgumentException("error encoding part", e);
+		}
+	}
 }