Improve logging for Guard server (#20)

lib/github.go

@@ -19,7 +19,7 @@ func checkGithub(name, token string) (auth.TokenReview, int) {
 
 	user, _, err := client.Users.Get(ctx, "")
 	if err != nil {
-		return Error(fmt.Sprintf("Failed to load user's Github profile. Reason: %v.", err)), http.StatusUnauthorized
+		return Error(fmt.Sprintf("Failed to load user's Github profile for Org %s. Reason: %v.", name, err)), http.StatusUnauthorized
 	}
 	data := auth.TokenReview{}
 	data.Status = auth.TokenReviewStatus{
@@ -35,7 +35,7 @@ func checkGithub(name, token string) (auth.TokenReview, int) {
 	for {
 		teams, _, err := client.Organizations.ListUserTeams(ctx, &github.ListOptions{Page: page, PerPage: pageSize})
 		if err != nil {
-			return Error(fmt.Sprintf("Failed to load user's teams. Reason: %v.", err)), http.StatusUnauthorized
+			return Error(fmt.Sprintf("Failed to load user's teams for Org %s. Reason: %v.", name, err)), http.StatusUnauthorized
 		}
 		for _, team := range teams {
 			if team.Organization.GetLogin() == name {

lib/google.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/appscode/go/log"
 	"golang.org/x/oauth2"
 	gdir "google.golang.org/api/admin/directory/v1"
 	gauth "google.golang.org/api/oauth2/v1"
@@ -20,11 +21,13 @@ func checkGoogle(name, token string) (auth.TokenReview, int) {
 
 	authSvc, err := gauth.New(client)
 	if err != nil {
-		return Error(fmt.Sprintf("Failed to create oauth2/v1 api client. Reason: %v.", err)), http.StatusUnauthorized
+		return Error(fmt.Sprintf("Failed to create oauth2/v1 api client for domain %s. Reason: %v.", name, err)), http.StatusUnauthorized
 	}
 	r1, err := authSvc.Userinfo.Get().Do()
 	if err != nil {
-		return Error(fmt.Sprintf("Failed to load user info. Reason: %v.", err)), http.StatusUnauthorized
+		msg := fmt.Sprintf("Failed to load user info for domain %s. Reason: %v.", name, err)
+		log.Errorln(msg)
+		return Error(msg), http.StatusUnauthorized
 	}
 
 	data := auth.TokenReview{}
@@ -37,15 +40,15 @@ func checkGoogle(name, token string) (auth.TokenReview, int) {
 
 	svc, err := gdir.New(client)
 	if err != nil {
-		return Error(fmt.Sprintf("Failed to create admin/directory/v1 client. Reason: %v.", err)), http.StatusUnauthorized
+		return Error(fmt.Sprintf("Failed to create admin/directory/v1 client for domain %s. Reason: %v.", name, err)), http.StatusUnauthorized
 	}
 
 	groups := []string{}
 	var pageToken string
 	for {
 		r2, err := svc.Groups.List().UserKey(r1.Email).PageToken(pageToken).Do()
 		if err != nil {
-			return Error(fmt.Sprintf("Failed to load user's groups. Reason: %v.", err)), http.StatusUnauthorized
+			return Error(fmt.Sprintf("Failed to load user's groups for domain %s. Reason: %v.", name, err)), http.StatusUnauthorized
 		}
 		for _, group := range r2.Groups {
 			if strings.HasSuffix(group.Email, "@"+name) {

lib/handler.go

@@ -5,17 +5,18 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/appscode/go/log"
 	auth "k8s.io/client-go/pkg/apis/authentication/v1beta1"
 )
 
 func Authenticate(w http.ResponseWriter, req *http.Request) {
 	crt := req.TLS.PeerCertificates[0]
-
 	if len(crt.Subject.Organization) == 0 {
 		Write(w, Error("Client certificate is missing organization"), http.StatusBadRequest)
 		return
 	}
 	org := crt.Subject.Organization[0]
+	log.Infoln("Received token review request for %s@%s", crt.Subject.CommonName, org)
 
 	data := auth.TokenReview{}
 	err := json.NewDecoder(req.Body).Decode(&data)

lib/types.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"github.com/appscode/go/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	auth "k8s.io/client-go/pkg/apis/authentication/v1beta1"
 )
@@ -25,15 +26,16 @@ func Write(w http.ResponseWriter, data auth.TokenReview, code int) {
 }
 
 // Error returns a `TokenReview` response with the specified error message.
-func Error(error string) auth.TokenReview {
+func Error(err string) auth.TokenReview {
+	log.Errorln(err)
 	return auth.TokenReview{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: apiVersion,
 			Kind:       "TokenReview",
 		},
 		Status: auth.TokenReviewStatus{
 			Authenticated: false,
-			Error:         error,
+			Error:         err,
 		},
 	}
 }