fixup previous authorize

Emyrk · Emyrk · commit 321a14579472 · 2024-02-28T10:32:03.000-06:00
diff --git a/coderd/httpmw/organizationparam_test.go b/coderd/httpmw/organizationparam_test.go
@@ -226,6 +226,6 @@ func TestOrganizationParam(t *testing.T) {
 		rtr.ServeHTTP(rw, r)
 		res = rw.Result()
 		defer res.Body.Close()
-		require.Equal(t, http.StatusOK, res.StatusCode, "by default keyword")
+		require.Equal(t, http.StatusOK, res.StatusCode, "by nil uuid (legacy)")
 	})
 }
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -2,7 +2,6 @@ package coderd
 
 import (
 	"context"
-	"crypto/subtle"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -115,13 +114,10 @@ func (p *provisionerDaemonAuth) authorize(r *http.Request, tags map[string]strin
 	}
 
 	// Check for PSK
-	if p.psk != "" {
-		psk := r.Header.Get(codersdk.ProvisionerDaemonPSK)
-		if subtle.ConstantTimeCompare([]byte(p.psk), []byte(psk)) == 1 {
-			// If using PSK auth, the daemon is, by definition, scoped to the organization.
-			tags = provisionersdk.MutateTags(uuid.Nil, tags)
-			return tags, true
-		}
+	provAuth := httpmw.ProvisionerDaemonAuthenticated(r)
+	if provAuth {
+		// If using PSK auth, the daemon is, by definition, scoped to the organization.
+		return tags, true
 	}
 	return nil, false
 }

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,6 @@ func TestOrganizationParam(t *testing.T) {`
`226`	`226`	`rtr.ServeHTTP(rw, r)`
`227`	`227`	`res = rw.Result()`
`228`	`228`	`defer res.Body.Close()`
`229`		`- require.Equal(t, http.StatusOK, res.StatusCode, "by default keyword")`
	`229`	`+ require.Equal(t, http.StatusOK, res.StatusCode, "by nil uuid (legacy)")`
`230`	`230`	`})`
`231`	`231`	`}`