allow login.html

Author: yaacov

deploy/Dockerfile Dockerfiledeploy/Dockerfile renamed to Dockerfile

@@ -1,18 +1,10 @@
 # build stage
-FROM quay.io/fedora/fedora:34-x86_64 AS build
-WORKDIR /app
-RUN sudo dnf install -y git golang
-
-RUN git clone https://github.com/yaacov/oc-gate.git /app \
-  && git clone https://github.com/novnc/noVNC /app/web/public/noVNC \
-  && go get github.com/yaacov/oc-gate/cmd/oc-gate \
-  && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /app/ /app/cmd/oc-gate/
+FROM golang:1.15 AS build
 
-# deploy stage
+WORKDIR /app
+COPY . .
 
-# quay does not have an alpine image,
-# an option is to switch to using fedora-minimal
-# another option is to use alpine (only from dockerhub)
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o /app/ /app/cmd/... 
 
 # FROM quay.io/fedora/fedora-minimal:34-x86_64
 FROM alpine

Makefile

@@ -43,6 +43,6 @@ novnc:
 
 .PHONY: image
 image:
-	podman build -t yaacov/oc-gate ./deploy
+	podman build -t yaacov/oc-gate .
 	podman tag yaacov/oc-gate quay.io/yaacov/oc-gate
 	# podman push quay.io/yaacov/oc-gate

pkg/proxy/proxy.go

@@ -121,6 +121,11 @@ func (s Server) AuthMiddleware(next http.Handler) http.Handler {
 		// Log request
 		log.Printf("%s %v: %+v", r.RemoteAddr, r.Method, r.URL)
 
+		if r.URL.Path == "/login.html" {
+			next.ServeHTTP(w, r)
+			return
+		}
+
 		// Get request token from Authorization header and session cookie
 		token, _ := s.GetRequestToken(w, r)