Add more logging to test-webhook's endpoint

- Also correct the webhook url setting in prepare-for-integration-tests.sh
- Change the bcrypt count to 10, because 16 is way too slow on old laptops

Signed-off-by: Ryan Richard <richardry@vmware.com>

cmd/test-webhook/main.go

@@ -111,20 +111,24 @@ func (w *webhook) ServeHTTP(rsp http.ResponseWriter, req *http.Request) {
 	defer req.Body.Close()
 
 	if req.URL.Path != "/authenticate" {
+		klog.InfoS("received request path other than /authenticate", "path", req.URL.Path)
 		rsp.WriteHeader(http.StatusNotFound)
 		return
 	}
 
 	if req.Method != http.MethodPost {
+		klog.InfoS("received request method other than post", "method", req.Method)
 		rsp.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
 
 	if !contains(req.Header.Values("Content-Type"), "application/json") {
+		klog.InfoS("wrong content type", "Content-Type", req.Header.Values("Content-Type"))
 		rsp.WriteHeader(http.StatusUnsupportedMediaType)
 		return
 	}
 	if !contains(req.Header.Values("Accept"), "application/json") {
+		klog.InfoS("wrong accept type", "Accept", req.Header.Values("Accept"))
 		rsp.WriteHeader(http.StatusUnsupportedMediaType)
 		return
 	}
@@ -138,6 +142,7 @@ func (w *webhook) ServeHTTP(rsp http.ResponseWriter, req *http.Request) {
 
 	tokenSegments := strings.SplitN(body.Spec.Token, ":", 2)
 	if len(tokenSegments) != 2 {
+		klog.InfoS("bad token format in request")
 		rsp.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -153,6 +158,7 @@ func (w *webhook) ServeHTTP(rsp http.ResponseWriter, req *http.Request) {
 	}
 
 	if notFound {
+		klog.InfoS("user not found")
 		respondWithUnauthenticated(rsp)
 		return
 	}
@@ -162,6 +168,7 @@ func (w *webhook) ServeHTTP(rsp http.ResponseWriter, req *http.Request) {
 		[]byte(password),
 	) == nil
 	if !passwordMatches {
+		klog.InfoS("invalid password in request")
 		respondWithUnauthenticated(rsp)
 		return
 	}
@@ -179,6 +186,7 @@ func (w *webhook) ServeHTTP(rsp http.ResponseWriter, req *http.Request) {
 		trimLeadingAndTrailingWhitespace(groups)
 	}
 
+	klog.InfoS("successful authentication")
 	respondWithAuthenticated(rsp, secret.ObjectMeta.Name, string(secret.UID), groups)
 }
 

deploy-test-webhook/README.md

@@ -45,7 +45,7 @@ who belongs to the groups `group1` and `group2`, use:
 kubectl create secret generic ryan \
   --namespace test-webhook \
   --from-literal=groups=group1,group2 \
-  --from-literal=passwordHash=$(htpasswd -nbBC 16 x password123 | sed -e "s/^x://")
+  --from-literal=passwordHash=$(htpasswd -nbBC 10 x password123 | sed -e "s/^x://")
 ```
 
 ### Get the `test-webhook` App's Auto-Generated Certificate Authority Bundle

hack/prepare-for-integration-tests.sh

@@ -44,9 +44,9 @@ function log_note() {
   GREEN='\033[0;32m'
   NC='\033[0m'
   if [[ $COLORTERM =~ ^(truecolor|24bit)$ ]]; then
-    echo -e " ${GREEN}:)${NC} Note: $*"
+    echo -e "${GREEN}$*${NC}"
   else
-    echo " :) Note: $*"
+    echo "$*"
   fi
 }
 
@@ -54,7 +54,7 @@ function log_warning() {
   YELLOW='\033[0;33m'
   NC='\033[0m'
   if [[ $COLORTERM =~ ^(truecolor|24bit)$ ]]; then
-    echo -e " ${YELLOW}:/${NC} Warning: $*"
+    echo -e "😒${YELLOW} Warning: $* ${NC}"
   else
     echo ":/ Warning: $*"
   fi
@@ -64,7 +64,7 @@ function log_error() {
   RED='\033[0;31m'
   NC='\033[0m'
   if [[ $COLORTERM =~ ^(truecolor|24bit)$ ]]; then
-    echo -e " ${RED}:(${NC} Error: $*"
+    echo -e "🙁${RED} Error: $* ${NC}"
   else
     echo ":( Error: $*"
   fi
@@ -235,21 +235,21 @@ else
 
   log_note "Creating test user 'test-username'..."
   test_username="test-username"
+  # TODO AUTO-GENERATE PASSWORD
   test_password="test-password"
   test_groups="test-group-0,test-group-1"
   kubectl create secret generic "$test_username" \
     --namespace test-webhook \
     --from-literal=groups="$test_groups" \
-    --from-literal=passwordHash=$(htpasswd -nbBC 16 x "$test_password" | sed -e "s/^x://") \
+    --from-literal=passwordHash="$(htpasswd -nbBC 10 x "$test_password" | sed -e "s/^x://")" \
     --dry-run=client \
     --output yaml \
     | kubectl apply -f -
 
   app_name="pinniped"
   namespace="integration"
-  webhook_url="test-webhook.test-webhook.svc"
+  webhook_url="https://test-webhook.test-webhook.svc/authenticate"
-  webhook_ca_bundle="$(kubectl get secret api-serving-cert --namespace test-webhook \
+  webhook_ca_bundle="$(kubectl get secret api-serving-cert --namespace test-webhook -o 'jsonpath={.data.caCertificate}')"
-    -o jsonpath={.data.caCertificate})"
   discovery_url="$(TERM=dumb kubectl cluster-info | awk '/Kubernetes master/ {print $NF}')"
 
   #
@@ -295,6 +295,8 @@ PINNIPED_CLUSTER_CAPABILITY_YAML_EOF
 export PINNIPED_CLUSTER_CAPABILITY_YAML
 EOF
 
+  goland_vars=$(grep -v '^#' /tmp/integration-test-env | grep -E '^export .+=' | sed 's/export //g' | tr '\n' ';')
+
   log_note "Done!"
   log_note
   log_note "Ready to run integration tests. For example, you could run all tests using the following commands..."
@@ -303,8 +305,6 @@ EOF
   log_note '    (cd test && go test -count 1 ./...)'
   log_note
   log_note '"Environment" setting for GoLand run configurations:'
-  log_note -n '    '
-  goland_vars=$(grep -v '^#' /tmp/integration-test-env | grep -E '^export .+=' | sed 's/export //g' | tr '\n' ';')
   log_note "    ${goland_vars}PINNIPED_CLUSTER_CAPABILITY_FILE=${kind_capabilities_file}"
   log_note
   log_note