Merge branch 'master' into cleanversion

davidkarlsen · web-flow · commit a91183edf0e6 · 2020-10-28T23:54:10.000+01:00
diff --git a/.VERSION b/.VERSION
@@ -1 +1 @@
-version: v0.2.71
+version: v0.2.77
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,8 @@
-#!/usr/bin/env groovy
-@Library('github.com/stakater/stakater-pipeline-library@v2.16.15') _
+#!/usr/bin/groovy
+@Library('github.com/stakater/stakater-pipeline-library@v2.16.24') _
 
 goBuildViaGoReleaser {
     publicChartRepositoryURL = 'https://stakater.github.io/stakater-charts'
     publicChartGitURL = 'git@github.com:stakater/stakater-charts.git'
-}
+    toolsImage = 'stakater/pipeline-tools:v2.0.18'
+}
diff --git a/README.md b/README.md
@@ -131,6 +131,12 @@ jenkinswebhookproxy:
     restart: on-failure
 ```
 
+## Troubleshooting
+### 405 Method Not Allowed with Jenkins & github plugin
+If you get the following error when setting up webhooks for your jobs in Jenkins, make sure you have the trailing `/` in the webhook configured in Jenkins. 
+```
+Error Redirecting '/github-webhook' to upstream', Upstream Redirect Status: 405 Method Not Allowed
+```
 
 ## Help
 
@@ -140,8 +146,8 @@ File a GitHub [issue](https://github.com/stakater/GitWebhookProxy/issues), or se
 ### Talk to us on Slack
 Join and talk to us on the #tools-gwp channel for discussing about GitWebhookProxy
 
-[![Join Slack](https://stakater.github.io/README/stakater-join-slack-btn.png)](https://stakater-slack.herokuapp.com/)
-[![Chat](https://stakater.github.io/README/stakater-chat-btn.png)](https://stakater.slack.com/messages/CAQ5A4HGD/)
+[![Join Slack](https://stakater.github.io/README/stakater-join-slack-btn.png)](https://slack.stakater.com/)
+[![Chat](https://stakater.github.io/README/stakater-chat-btn.png)](https://stakater-community.slack.com/messages/CAQ5A4HGD)
 
 ## Contributing
 
diff --git a/deployments/kubernetes/chart/gitwebhookproxy/Chart.yaml b/deployments/kubernetes/chart/gitwebhookproxy/Chart.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 name: gitwebhookproxy
 description: GitWebhookProxy chart that runs on kubernetes
-version: v0.2.71
+version: v0.2.77
 keywords:
   - GitWebhookProxy
   - kubernetes
diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml b/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml
@@ -83,7 +83,9 @@ spec:
           valueFrom:
             secretKeyRef:
               key: secret
-            {{- if .Values.gitWebhookProxy.useCustomName }}
+            {{- if .Values.gitWebhookProxy.existingSecretName }}
+              name: {{ .Values.gitWebhookProxy.existingSecretName }}
+            {{- else if .Values.gitWebhookProxy.useCustomName }}
               name: {{ .Values.gitWebhookProxy.customName }}
             {{- else }}
               name: {{ template "gitwebhookproxy.name" . }}
diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/ingress.yaml b/deployments/kubernetes/chart/gitwebhookproxy/templates/ingress.yaml
@@ -30,4 +30,7 @@ spec:
   tls:
   - hosts:
     - {{ .Values.gitWebhookProxy.ingress.host }}
+  {{- if .Values.gitWebhookProxy.ingress.tlsSecretName }}
+    secretName: {{ .Values.gitWebhookProxy.ingress.tlsSecretName }}
+  {{- end }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/secret.yaml b/deployments/kubernetes/chart/gitwebhookproxy/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.gitWebhookProxy.existingSecretName }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -10,4 +11,5 @@ metadata:
   name: {{ template "gitwebhookproxy.name" . }}
 {{- end }}
 data:
-    secret: "{{ .Values.gitWebhookProxy.config.secret | b64enc }}"
+    secret: "{{ .Values.gitWebhookProxy.config.secret | b64enc }}"
+{{- end }}
diff --git a/deployments/kubernetes/chart/gitwebhookproxy/values.yaml b/deployments/kubernetes/chart/gitwebhookproxy/values.yaml
@@ -7,13 +7,15 @@ gitWebhookProxy:
   useCustomName: false
   customName: gitlabwebhookproxy
   namespace: default
+  # name of existing secret containing secret for hashes
+  existingSecretName: ""
   labels:
     provider: stakater
     group: com.stakater.platform
-    version: v0.2.71
+    version: v0.2.77
   image:
     name: stakater/gitwebhookproxy
-    tag: "v0.2.71"
+    tag: "v0.2.77"
     pullPolicy: IfNotPresent
   config:
     provider: github
@@ -38,5 +40,6 @@ gitWebhookProxy:
       kubernetes.io/ingress.class: external-ingress
       monitor.stakater.com/enabled: "true"
     host: gitwebhookproxy.tools.stackator.com
+    tlsSecretName: ""
     serviceName: gitwebhookproxy
     servicePort: 80
diff --git a/deployments/kubernetes/gitwebhookproxy.yaml b/deployments/kubernetes/gitwebhookproxy.yaml
@@ -1,3 +1,26 @@
+---
+# Source: gitwebhookproxy/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    fabric8.io/target-platform: kubernetes
+  labels:
+    app: gitwebhookproxy
+    group: com.stakater.platform
+    provider: stakater
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
+    release: "gitwebhookproxy"
+    heritage: "Tiller"
+  name: gitwebhookproxy
+data:
+    provider: github
+    upstreamURL: https://jenkins.tools.stackator.com
+    allowedPaths: /github-webhook,/project
+    ignoredUsers: stakater-user
+    allowedUsers: myuser
+
 ---
 # Source: gitwebhookproxy/templates/deployment.yaml
 apiVersion: apps/v1
@@ -7,8 +30,8 @@ metadata:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
   annotations:
@@ -66,7 +89,7 @@ spec:
             secretKeyRef:
               key: secret
               name: gitwebhookproxy
-        image: "stakater/gitwebhookproxy:v0.2.71"
+        image: "stakater/gitwebhookproxy:v0.2.77"
         imagePullPolicy: IfNotPresent
         name: gitwebhookproxy
         livenessProbe:
@@ -96,20 +119,22 @@ spec:
 
 ---
 # Source: gitwebhookproxy/templates/secret.yaml
+
 apiVersion: v1
 kind: Secret
 metadata:
   labels:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
   name: gitwebhookproxy
 data:
     secret: ""
+
 ---
 # Source: gitwebhookproxy/templates/service.yaml
 apiVersion: v1
@@ -119,8 +144,8 @@ metadata:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
     expose: "true"
@@ -136,26 +161,3 @@ spec:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
----
-# Source: gitwebhookproxy/templates/configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  annotations:
-    fabric8.io/target-platform: kubernetes
-  labels:
-    app: gitwebhookproxy
-    group: com.stakater.platform
-    provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
-    release: "gitwebhookproxy"
-    heritage: "Tiller"
-  name: gitwebhookproxy
-data:
-    provider: github
-    upstreamURL: https://jenkins.tools.stackator.com
-    allowedPaths: /github-webhook,/project
-    ignoredUsers: stakater-user
-    allowedUsers: myuser
-
diff --git a/deployments/kubernetes/manifests/configmap.yaml b/deployments/kubernetes/manifests/configmap.yaml
@@ -9,8 +9,8 @@ metadata:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
   name: gitwebhookproxy
diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml
@@ -7,8 +7,8 @@ metadata:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
   annotations:
@@ -66,7 +66,7 @@ spec:
             secretKeyRef:
               key: secret
               name: gitwebhookproxy
-        image: "stakater/gitwebhookproxy:v0.2.71"
+        image: "stakater/gitwebhookproxy:v0.2.77"
         imagePullPolicy: IfNotPresent
         name: gitwebhookproxy
         livenessProbe:
diff --git a/deployments/kubernetes/manifests/secret.yaml b/deployments/kubernetes/manifests/secret.yaml
@@ -1,16 +1,18 @@
 ---
 # Source: gitwebhookproxy/templates/secret.yaml
+
 apiVersion: v1
 kind: Secret
 metadata:
   labels:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
   name: gitwebhookproxy
 data:
     secret: ""
+
diff --git a/deployments/kubernetes/manifests/service.yaml b/deployments/kubernetes/manifests/service.yaml
@@ -7,8 +7,8 @@ metadata:
     app: gitwebhookproxy
     group: com.stakater.platform
     provider: stakater
-    version: v0.2.71
-    chart: "gitwebhookproxy-v0.2.71"
+    version: v0.2.77
+    chart: "gitwebhookproxy-v0.2.77"
     release: "gitwebhookproxy"
     heritage: "Tiller"
     expose: "true"
diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl
@@ -7,6 +7,8 @@ gitWebhookProxy:
   useCustomName: false
   customName: gitlabwebhookproxy
   namespace: default
+  # name of existing secret containing secret for hashes
+  existingSecretName: ""
   labels:
     provider: stakater
     group: com.stakater.platform
@@ -38,5 +40,6 @@ gitWebhookProxy:
       kubernetes.io/ingress.class: external-ingress
       monitor.stakater.com/enabled: "true"
     host: gitwebhookproxy.tools.stackator.com
+    tlsSecretName: ""
     serviceName: gitwebhookproxy
     servicePort: 80
diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -74,9 +74,11 @@ func (p *Proxy) isAllowedUser(committer string) bool {
 		if exists, _ := utils.InArray(p.allowedUsers, committer); exists {
 			return true
 		}
+
+		return false
 	}
 
-	return false
+	return true
 }
 
 func (p *Proxy) redirect(hook *providers.Hook, redirectURL string) (*http.Response, error) {
@@ -142,7 +144,7 @@ func (p *Proxy) proxyRequest(w http.ResponseWriter, r *http.Request, params http
 
 	committer := provider.GetCommitter(*hook)
 	log.Printf("Incoming request from user: %s", committer)
-	if p.isIgnoredUser(committer) && (!p.isAllowedUser(committer)) {
+	if p.isIgnoredUser(committer) || (!p.isAllowedUser(committer)) {
 		log.Printf("Ignoring request for user: %s", committer)
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte(fmt.Sprintf("Ignoring request for user: %s", committer)))
diff --git a/pkg/proxy/proxy_test.go b/pkg/proxy/proxy_test.go
@@ -1037,7 +1037,7 @@ func TestProxy_isAllowedUser(t *testing.T) {
 			args: args{
 				committer: "user",
 			},
-			want: false,
+			want: true,
 		},
 		{
 			name: "TestIsAllowedUserWithValidList",
