From 0c45d64b6b5ae76a15d847b9756dc0c96a3727e3 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 10 Sep 2020 10:57:09 -0400
Subject: [PATCH] Always use internal auth for build submit

---
 gitsrht-update-hook/post-update.go |  1 +
 gitsrht-update-hook/submitter.go   | 29 ++++++++++++-----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/gitsrht-update-hook/post-update.go b/gitsrht-update-hook/post-update.go
index 9090198..d14d616 100644
--- a/gitsrht-update-hook/post-update.go
+++ b/gitsrht-update-hook/post-update.go
@@ -305,6 +305,7 @@ func postUpdate() {
 			}
 			results, err := SubmitBuild(submitter)
 			if err != nil {
+				logger.Printf("Error submitting build job: %v", err)
 				log.Fatalf("Error submitting build job: %v", err)
 			}
 			if len(results) == 0 {
diff --git a/gitsrht-update-hook/submitter.go b/gitsrht-update-hook/submitter.go
index 0f43bb5..e50174c 100644
--- a/gitsrht-update-hook/submitter.go
+++ b/gitsrht-update-hook/submitter.go
@@ -262,24 +262,19 @@ type BuildSubmission struct {
 func configureRequestAuthorization(submitter BuildSubmitter,
 	req *http.Request) {
 
-	if submitter.GetOauthToken() != nil {
-		req.Header.Add("Authorization", fmt.Sprintf("token %s",
-			*submitter.GetOauthToken()))
-	} else {
-		auth := InternalRequestAuthorization{
-			ClientId: clientId,
-			Username: submitter.GetOwnerName(),
-		}
-		authPayload, err := json.Marshal(&auth)
-		if err != nil {
-			logger.Fatalf("Failed to marshal internal authorization: %v", err)
-		}
-		enc, err := fernet.EncryptAndSign(authPayload, fernetKey)
-		if err != nil {
-			logger.Fatalf("Failed to encrypt internal authorization: %v", err)
-		}
-		req.Header.Add("X-Srht-Authorization", string(enc))
+	auth := InternalRequestAuthorization{
+		ClientId: clientId,
+		Username: submitter.GetOwnerName(),
+	}
+	authPayload, err := json.Marshal(&auth)
+	if err != nil {
+		logger.Fatalf("Failed to marshal internal authorization: %v", err)
+	}
+	enc, err := fernet.EncryptAndSign(authPayload, fernetKey)
+	if err != nil {
+		logger.Fatalf("Failed to encrypt internal authorization: %v", err)
 	}
+	req.Header.Add("X-Srht-Authorization", string(enc))
 }
 
 // TODO: Move this to scm.sr.ht
-- 
2.38.4