Replace base64 encoding with random uuid #1215
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
|
This change is |
sethpollack
reviewed
Aug 22, 2017
| @@ -342,8 +342,7 @@ var ( | |||
|
|
|||
| func buildWhitelistVariable(s string) string { | |||
| if _, ok := whitelistVarMap[s]; !ok { | |||
| str := base64.URLEncoding.EncodeToString([]byte(s)) | |||
| whitelistVarMap[s] = strings.Replace(str, "=", "", -1) | |||
| whitelistVarMap[s] = fmt.Sprintf("whitelist_%v", uuid.New()) | |||
There was a problem hiding this comment.
You still need to strip the - from the uuid's.
There was a problem hiding this comment.
that is not needed, we already use this for the whitelist feature
geo $the_real_ip $deny_9ab24030-716f-4c64-9ed5-ec94ec67f001 {
default 1;
192.168.8.104/32 0;
}
There was a problem hiding this comment.
hmm, I tried that yesterday and got an error because its an invalid variable.
There was a problem hiding this comment.
Let me test real quick
There was a problem hiding this comment.
Error: exit status 1
2017/08/22 13:02:25 [emerg] 21#21: unknown "whitelist_8329fc5c" variable
nginx: [emerg] unknown "whitelist_8329fc5c" variable
nginx: configuration file /tmp/nginx-cfg571771066 test failed
-------------------------------------------------------------------------------
W0822 13:02:25.543292 5 queue.go:90] requeuing kube-system/kube-dns, err
-------------------------------------------------------------------------------
Error: exit status 1
2017/08/22 13:02:25 [emerg] 21#21: unknown "whitelist_8329fc5c" variable
nginx: [emerg] unknown "whitelist_8329fc5c" variable
nginx: configuration file /tmp/nginx-cfg571771066 test failed
-------------------------------------------------------------------------------
I0822 13:02:28.050807 5 controller.go:423] backend reload required
E0822 13:02:28.077494 5 controller.go:428] unexpected failure restarting the backend:
-------------------------------------------------------------------------------
Error: exit status 1
2017/08/22 13:02:28 [emerg] 26#26: unknown "whitelist_8329fc5c" variable
nginx: [emerg] unknown "whitelist_8329fc5c" variable
nginx: configuration file /tmp/nginx-cfg523483857 test failed
-------------------------------------------------------------------------------
W0822 13:02:28.077531 5 queue.go:90] requeuing kube-system/kubernetes-dashboard, err
-------------------------------------------------------------------------------
Error: exit status 1
2017/08/22 13:02:28 [emerg] 26#26: unknown "whitelist_8329fc5c" variable
nginx: [emerg] unknown "whitelist_8329fc5c" variable
nginx: configuration file /tmp/nginx-cfg523483857 test failed
-------------------------------------------------------------------------------```
There was a problem hiding this comment.
@sethpollack please post the ingress you are using
There was a problem hiding this comment.
kind: Ingress
metadata:
name: sample-app
annotations:
kubernetes.io/ingress.class: "nginx"
ingress.kubernetes.io/limit-whitelist: 127.0.0.1
ingress.kubernetes.io/limit-rpm: "10"
spec:
rules:
- host: sample-app.com
http:
paths:
- path: /foo
backend:
serviceName: nginx-default-backend
servicePort: 80
There was a problem hiding this comment.
I only get the error with the rate limit whitelist, not ingress.kubernetes.io/whitelist-source-range
|
@sethpollack please review. Temporal image with this PR: quay.io/aledbf/nginx-ingress-controller:0.188 |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.