mirror of
https://github.com/openfaas/faas.git
synced 2025-06-26 08:43:24 +00:00
Allow dot in function name
This patch enables the use-case for multiple namepsaces by allowing a dot to be used in the function name. dep has been run to update OpenFaaS projects and also to prune unused files. Tested by doing a build. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
committed by
Alex Ellis
parent
dc3c5fb9b3
commit
0a90125aba
66
gateway/vendor/github.com/openfaas/faas-provider/auth/basic_auth_test.go
generated
vendored
66
gateway/vendor/github.com/openfaas/faas-provider/auth/basic_auth_test.go
generated
vendored
@ -1,66 +0,0 @@
|
||||
// Copyright (c) OpenFaaS Author(s). All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
package auth
|
||||
|
||||
import (
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func Test_AuthWithValidPassword_Gives200(t *testing.T) {
|
||||
|
||||
handler := func(w http.ResponseWriter, r *http.Request) {
|
||||
io.WriteString(w, "<html><body>Hello World!</body></html>")
|
||||
}
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
wantUser := "admin"
|
||||
wantPassword := "password"
|
||||
r := httptest.NewRequest(http.MethodGet, "http://localhost:8080", nil)
|
||||
r.SetBasicAuth(wantUser, wantPassword)
|
||||
wantCredentials := &BasicAuthCredentials{
|
||||
User: wantUser,
|
||||
Password: wantPassword,
|
||||
}
|
||||
|
||||
decorated := DecorateWithBasicAuth(handler, wantCredentials)
|
||||
decorated.ServeHTTP(w, r)
|
||||
|
||||
wantCode := http.StatusOK
|
||||
|
||||
if w.Code != wantCode {
|
||||
t.Errorf("status code, want: %d, got: %d", wantCode, w.Code)
|
||||
t.Fail()
|
||||
}
|
||||
}
|
||||
|
||||
func Test_AuthWithInvalidPassword_Gives403(t *testing.T) {
|
||||
|
||||
handler := func(w http.ResponseWriter, r *http.Request) {
|
||||
io.WriteString(w, "<html><body>Hello World!</body></html>")
|
||||
}
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
wantUser := "admin"
|
||||
wantPassword := "test"
|
||||
r := httptest.NewRequest(http.MethodGet, "http://localhost:8080", nil)
|
||||
r.SetBasicAuth(wantUser, wantPassword)
|
||||
|
||||
wantCredentials := &BasicAuthCredentials{
|
||||
User: wantUser,
|
||||
Password: "",
|
||||
}
|
||||
|
||||
decorated := DecorateWithBasicAuth(handler, wantCredentials)
|
||||
decorated.ServeHTTP(w, r)
|
||||
|
||||
wantCode := http.StatusUnauthorized
|
||||
if w.Code != wantCode {
|
||||
t.Errorf("status code, want: %d, got: %d", wantCode, w.Code)
|
||||
t.Fail()
|
||||
}
|
||||
}
|
64
gateway/vendor/github.com/openfaas/faas-provider/auth/credentials_test.go
generated
vendored
64
gateway/vendor/github.com/openfaas/faas-provider/auth/credentials_test.go
generated
vendored
@ -1,64 +0,0 @@
|
||||
// Copyright (c) OpenFaaS Author(s). All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
package auth
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func Test_ReadFromCustomLocation_AndNames(t *testing.T) {
|
||||
tmp := os.TempDir()
|
||||
|
||||
userWant := "admin"
|
||||
ioutil.WriteFile(path.Join(tmp, "user.txt"), []byte(userWant), 0700)
|
||||
|
||||
passWant := "test1234"
|
||||
ioutil.WriteFile(path.Join(tmp, "pass.txt"), []byte(passWant), 0700)
|
||||
|
||||
reader := ReadBasicAuthFromDisk{
|
||||
SecretMountPath: tmp,
|
||||
UserFilename: "user.txt",
|
||||
PasswordFilename: "pass.txt",
|
||||
}
|
||||
|
||||
creds, err := reader.Read()
|
||||
if err != nil {
|
||||
t.Errorf("can't read secrets: %s", err.Error())
|
||||
}
|
||||
|
||||
if creds.User != userWant {
|
||||
t.Errorf("user, want: %s, got %s", userWant, creds.User)
|
||||
}
|
||||
if creds.Password != passWant {
|
||||
t.Errorf("password, want: %s, got %s", passWant, creds.Password)
|
||||
}
|
||||
}
|
||||
|
||||
func Test_ReadFromCustomLocation_DefaultNames(t *testing.T) {
|
||||
tmp := os.TempDir()
|
||||
userWant := "admin"
|
||||
ioutil.WriteFile(path.Join(tmp, "basic-auth-user"), []byte(userWant), 0700)
|
||||
|
||||
passWant := "test1234"
|
||||
ioutil.WriteFile(path.Join(tmp, "basic-auth-password"), []byte(passWant), 0700)
|
||||
|
||||
reader := ReadBasicAuthFromDisk{
|
||||
SecretMountPath: tmp,
|
||||
}
|
||||
|
||||
creds, err := reader.Read()
|
||||
if err != nil {
|
||||
t.Errorf("can't read secrets: %s", err.Error())
|
||||
}
|
||||
|
||||
if creds.User != userWant {
|
||||
t.Errorf("user, want: %s, got %s", userWant, creds.User)
|
||||
}
|
||||
if creds.Password != passWant {
|
||||
t.Errorf("password, want: %s, got %s", passWant, creds.Password)
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user