Implemented basic auth for remote archives

Author: Knetic

RunSettings.go

@@ -17,6 +17,9 @@ type RunSettings struct {
 	skeletonPath string
 	targetPath   string
 
+	basicAuthUser string
+	basicAuthPass string
+
 	inspectionRun bool
 	addRegistry   bool
 	showRegistry  bool
@@ -40,6 +43,8 @@ var FLAGS = []string{
 	"-l",
 	"-f",
 	"-w",
+	"-bu",
+	"-bp",
 	"-flags",
 }
 
@@ -54,6 +59,8 @@ func FindRunSettings() (RunSettings, error) {
 	var err error
 
 	flag.StringVar(&parameterGroup, "p", "", "Semicolon-separated list of parameters in k=v form.")
+	flag.StringVar(&ret.basicAuthUser, "bu", "", "The 'user' to use when a remote archive requests Basic Authentication")
+	flag.StringVar(&ret.basicAuthPass, "bp", "", "The 'password' to use when a remote archive requests Basic Authentication")
 	flag.BoolVar(&ret.inspectionRun, "i", false, "Whether or not to show a list of available parameters for the skeleton")
 	flag.BoolVar(&ret.addRegistry, "a", false, "Whether or not to register the template at the given path (can be http/https URLs)")
 	flag.BoolVar(&ret.showRegistry, "l", false, "Whether or not to show a list of all available registered templates")

TemplateRegistry.go

@@ -109,16 +109,19 @@ func (this TemplateRegistry) GetTemplatePath(name string) (string, error) {
   Registers the given [path] in the registry, by copying the archive file to it.
   If the file is not an archive, or it cannot be read, or the registry cannot be written,
   an error is returned.
+  If the given [path] is remote (such as http), and if the server requires authentication,
+  the given [username] and [password] will be used.
+  If the path is local, username/password are inconsequential.
 */
-func (this *TemplateRegistry) RegisterTemplate(path string) (string, error) {
+func (this *TemplateRegistry) RegisterTemplate(path string, username string, password string) (string, error) {
 
 	var targetPath, name string
 	var err error
 
 	// if this is a remote path, download as a zip to a temporary directory before trying to register.
 	if strings.HasPrefix(path, "http://") || strings.HasPrefix(path, "https://") {
 
-		path, err = downloadArchive(path)
+		path, err = downloadArchive(path, username, password)
 		if(err != nil) {
 			return "", err
 		}
@@ -145,9 +148,11 @@ func (this *TemplateRegistry) RegisterTemplate(path string) (string, error) {
 	Downloads the given [url] to a temporary directory (as a .zip).
 	Returns the temporary path to the downloaded archive, or an error if it encountered one.
 */
-func downloadArchive(targetURL string) (string, error) {
+func downloadArchive(targetURL string, username string, password string) (string, error) {
 
+	var request *http.Request
 	var response *http.Response
+	var client http.Client
 	var outputFile *os.File
 	var parsedURL *url.URL
 	var outputPath string
@@ -164,6 +169,12 @@ func downloadArchive(targetURL string) (string, error) {
 		return "", err
 	}
 
+	request, err = http.NewRequest("GET", targetURL, nil)
+	if(err != nil) {
+		return "", err
+	}
+	request.SetBasicAuth(username, password)
+
 	baseName = filepath.Base(parsedURL.Path)
 	baseName = strings.TrimSuffix(baseName, filepath.Ext(baseName))
 	outputPath = filepath.Join(outputPath, baseName + ".zip")
@@ -175,12 +186,12 @@ func downloadArchive(targetURL string) (string, error) {
 	}
 	defer outputFile.Close()
 
-	response, err = http.Get(targetURL)
+	response, err = client.Do(request)
 	if(err != nil) {
 		return "", err
 	}
 
-	if(response.Status != "200") {
+	if(!strings.Contains(response.Status, "200")) {
 		errorMsg := fmt.Sprintf("Unable to download remote archive: HTTP %s\n", response.Status)
 		return "", errors.New(errorMsg)
 	}

main.go

@@ -56,7 +56,7 @@ func addRegistry(settings RunSettings, registry *TemplateRegistry) {
 	var name string
 	var err error
 
-	name, err = registry.RegisterTemplate(settings.skeletonPath)
+	name, err = registry.RegisterTemplate(settings.skeletonPath, settings.basicAuthUser, settings.basicAuthPass)
 	if err != nil {
 
 		// TODO: I'm deeply uncomfortable with using "exitWith" outside of the actual