feat(oauth): use oauth to unify service-to-service authentication.

Author: duanhongyi

api/config.go

@@ -169,7 +169,7 @@ func (k KVPair) String() string {
 	return k.Name + "=" + k.Value
 }
 
-// ExecProbe executes a command within a Pod.
+// ExecAction describes a command to execute within a Pod for probing.
 type ExecAction struct {
 	Command []string `json:"command"`
 }

apps/apps.go

@@ -30,14 +30,11 @@ func List(c *drycc.Client, workspace string, results int) (api.Apps, int, error)
 //
 // If the app name already exists, the error drycc.ErrDuplicateApp will be returned.
 func New(c *drycc.Client, appID string, workspace string) (api.App, error) {
-	body := []byte{}
-
 	req := api.AppCreateRequest{ID: appID, Workspace: workspace}
-	b, err := json.Marshal(req)
+	body, err := json.Marshal(req)
 	if err != nil {
 		return api.App{}, err
 	}
-	body = b
 
 	res, reqErr := c.Request("POST", "/v2/apps/", body)
 	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {

config/config_test.go

@@ -223,7 +223,7 @@ func TestConfigSet(t *testing.T) {
 	}
 
 	expected := api.Config{
-		App:   "example-go",
+		App: "example-go",
 		Values: []api.ConfigValue{
 			{
 				Group: "global",
@@ -395,7 +395,7 @@ func TestConfigList(t *testing.T) {
 	}
 
 	expected := api.Config{
-		App:   "example-go",
+		App: "example-go",
 		Values: []api.ConfigValue{
 			{
 				Group: "global",

drycc.go

@@ -81,11 +81,6 @@ type Client struct {
 
 	// Token is used to authenticate the request against the API.
 	Token string
-
-	// ServiceKey is the controller token used with the hooks resource.
-	// The hooks resource isn't intended to be used by users, so it requires
-	// a service token rather than a user token.
-	ServiceKey string
 }
 
 // APIVersion is the api version compatible with the SDK.

hooks/hooks_test.go

@@ -161,7 +161,7 @@ func TestConfigHook(t *testing.T) {
 	}
 
 	expected := api.Config{
-		App:   "example-go",
+		App: "example-go",
 		Values: []api.ConfigValue{
 			{
 				Group: "global",

http.go

@@ -26,12 +26,13 @@ func createHTTPClient(sslVerify bool) *http.Client {
 // following policy (such as redirects, cookies, auth) as configured on the client.
 func (c *Client) Do(req *http.Request) (*http.Response, error) {
 	if c.Token != "" {
-		req.Header.Add("Authorization", "token "+c.Token)
+		if strings.HasPrefix(strings.ToLower(c.Token), "bearer ") || strings.HasPrefix(strings.ToLower(c.Token), "token ") {
+			req.Header.Add("Authorization", c.Token)
+		} else {
+			req.Header.Add("Authorization", "token "+c.Token)
+		}
 	}
 
-	if c.ServiceKey != "" {
-		req.Header.Add("X-Drycc-Service-Key", c.ServiceKey)
-	}
 	if req.Header.Get("Content-Type") == "" {
 		req.Header.Add("Content-Type", "application/json")
 	}

http_test.go

@@ -68,14 +68,6 @@ func (f fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 			return
 		}
 
-		bT := "testing"
-		if req.Header.Get("X-Drycc-Service-Key") != bT {
-			fmt.Printf("Hook Token Wrong: Expected %s, Got %s\n", bT, req.Header.Get("X-Drycc-Service-Key"))
-			res.WriteHeader(http.StatusInternalServerError)
-			res.Write(nil)
-			return
-		}
-
 		eC := "application/json"
 		if req.Header.Get("Content-Type") != eC {
 			fmt.Printf("Content Type Wrong: Expected %s, Got %s\n", eC, req.Header.Get("Content-Type"))
@@ -160,7 +152,6 @@ func TestBasicRequest(t *testing.T) {
 		t.Fatal(err)
 	}
 	drycc.UserAgent = "test"
-	drycc.ServiceKey = "testing"
 
 	res, err := drycc.Request("POST", "/request/", []byte("test"))
 	if err != nil {

ps/ps.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"sort"
+	"strings"
 
 	drycc "github.com/drycc/controller-sdk-go"
 	"github.com/drycc/controller-sdk-go/api"
@@ -41,10 +42,13 @@ func Exec(c *drycc.Client, appID, podID string, command api.Command) (*websocket
 	if err != nil {
 		return nil, err
 	}
+	authHeader := c.Token
+	if !strings.HasPrefix(strings.ToLower(authHeader), "bearer ") && !strings.HasPrefix(strings.ToLower(authHeader), "token ") {
+		authHeader = "token " + authHeader
+	}
 	config.Header = http.Header{
-		"User-Agent":          {c.UserAgent},
-		"Authorization":       {"token " + c.Token},
-		"X-Drycc-Service-Key": {c.ServiceKey},
+		"User-Agent":    {c.UserAgent},
+		"Authorization": {authHeader},
 	}
 	conn, err := websocket.DialConfig(config)
 	if err != nil {
@@ -67,10 +71,13 @@ func Logs(c *drycc.Client, appID, podID string, request api.PodLogsRequest) (*we
 	if err != nil {
 		return nil, err
 	}
+	authHeader := c.Token
+	if !strings.HasPrefix(strings.ToLower(authHeader), "bearer ") && !strings.HasPrefix(strings.ToLower(authHeader), "token ") {
+		authHeader = "token " + authHeader
+	}
 	config.Header = http.Header{
-		"User-Agent":          {c.UserAgent},
-		"Authorization":       {"token " + c.Token},
-		"X-Drycc-Service-Key": {c.ServiceKey},
+		"User-Agent":    {c.UserAgent},
+		"Authorization": {authHeader},
 	}
 	conn, err := websocket.DialConfig(config)
 	if err != nil {

volumes/volumes_test.go

@@ -409,8 +409,8 @@ func TestVolumeMount(t *testing.T) {
 	}
 
 	expected := api.Volume{
-		Name:  "myvolume",
-		App:   "example-go",
+		Name: "myvolume",
+		App:  "example-go",
 		Path: map[string]any{
 			"cmd": "/data/cmd1",
 			"web": "/data/web1",