-
Notifications
You must be signed in to change notification settings - Fork 301
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #76 from ksensehq/PMF-22-destination-reloading
made destinations - reloadable
- Loading branch information
Showing
42 changed files
with
1,358 additions
and
469 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package authorization | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/ksensehq/eventnative/resources" | ||
| "strings" | ||
| ) | ||
|
|
||
| type Token struct { | ||
| Id string `mapstructure:"id" json:"id,omitempty"` | ||
| ClientSecret string `mapstructure:"client_secret" json:"client_secret,omitempty"` | ||
| ServerSecret string `mapstructure:"server_secret" json:"server_secret,omitempty"` | ||
| Origins []string `mapstructure:"origins" json:"origins,omitempty"` | ||
| } | ||
|
|
||
| type TokensPayload struct { | ||
| Tokens []Token `json:"tokens,omitempty"` | ||
| } | ||
|
|
||
| type TokensHolder struct { | ||
| //origins by client token | ||
| clientTokensOrigins map[string][]string | ||
| //origins by server token | ||
| serverTokensOrigins map[string][]string | ||
|
|
||
| //all token ids | ||
| ids []string | ||
| //token by: client_secret/server_secret/id | ||
| all map[string]Token | ||
| } | ||
|
|
||
| func (th *TokensHolder) IsEmpty() bool { | ||
| return th == nil || len(th.ids) == 0 | ||
| } | ||
|
|
||
| //parse tokens from json bytes | ||
| func parseFromBytes(b []byte) (*TokensHolder, error) { | ||
| payload := &TokensPayload{} | ||
| err := json.Unmarshal(b, payload) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error unmarshalling tokens. Payload must be json with 'tokens' key: %v", err) | ||
| } | ||
|
|
||
| return reformat(payload.Tokens), nil | ||
| } | ||
|
|
||
| func fromStrings(clientSecrets []string) *TokensHolder { | ||
| var tokens []Token | ||
| for _, clientSecret := range clientSecrets { | ||
| tokens = append(tokens, Token{ClientSecret: clientSecret}) | ||
| } | ||
| return reformat(tokens) | ||
| } | ||
|
|
||
| func reformat(tokens []Token) *TokensHolder { | ||
| clientTokensOrigins := map[string][]string{} | ||
| serverTokensOrigins := map[string][]string{} | ||
| all := map[string]Token{} | ||
| var ids []string | ||
|
|
||
| for _, tokenObj := range tokens { | ||
| if tokenObj.Id == "" { | ||
| //hash from client,server secret will be id | ||
| tokenObj.Id = resources.GetHash([]byte(tokenObj.ClientSecret + tokenObj.ServerSecret)) | ||
| } | ||
|
|
||
| all[tokenObj.Id] = tokenObj | ||
| ids = append(ids, tokenObj.Id) | ||
|
|
||
| trimmedClientToken := strings.TrimSpace(tokenObj.ClientSecret) | ||
| if trimmedClientToken != "" { | ||
| clientTokensOrigins[trimmedClientToken] = tokenObj.Origins | ||
| all[trimmedClientToken] = tokenObj | ||
| } | ||
|
|
||
| trimmedServerToken := strings.TrimSpace(tokenObj.ServerSecret) | ||
| if trimmedServerToken != "" { | ||
| serverTokensOrigins[trimmedServerToken] = tokenObj.Origins | ||
| all[trimmedServerToken] = tokenObj | ||
| } | ||
| } | ||
|
|
||
| return &TokensHolder{ | ||
| clientTokensOrigins: clientTokensOrigins, | ||
| serverTokensOrigins: serverTokensOrigins, | ||
| ids: ids, | ||
| all: all, | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package authorization | ||
|
|
||
| import ( | ||
| "github.com/ksensehq/eventnative/test" | ||
| "github.com/stretchr/testify/require" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestParseFromBytes(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| input []byte | ||
| expected *TokensHolder | ||
| expectedErr string | ||
| }{ | ||
| { | ||
| "Empty input", | ||
| []byte{}, | ||
| nil, | ||
| "Error unmarshalling tokens. Payload must be json with 'tokens' key: unexpected end of JSON input", | ||
| }, | ||
| { | ||
| "Wrong json keys format", | ||
| []byte(`{"tokens":{}}}`), | ||
| nil, | ||
| "Error unmarshalling tokens. Payload must be json with 'tokens' key: invalid character '}' after top-level value", | ||
| }, | ||
| { | ||
| "Empty json input", | ||
| []byte(`{}`), | ||
| &TokensHolder{clientTokensOrigins: map[string][]string{}, serverTokensOrigins: map[string][]string{}, all: map[string]Token{}}, | ||
| "", | ||
| }, | ||
| { | ||
| "Wrong keys json input", | ||
| []byte(`{"jsss":[], "apii": []}`), | ||
| &TokensHolder{clientTokensOrigins: map[string][]string{}, serverTokensOrigins: map[string][]string{}, all: map[string]Token{}}, | ||
| "", | ||
| }, | ||
|
|
||
| { | ||
| "Empty json tokens input", | ||
| []byte(`{"tokens":[]}`), | ||
| &TokensHolder{clientTokensOrigins: map[string][]string{}, serverTokensOrigins: map[string][]string{}, all: map[string]Token{}}, | ||
| "", | ||
| }, | ||
| { | ||
| "ok", | ||
| []byte(`{"tokens":[{"id":"id1","client_secret":"cl_secret1","server_secret":"sr_secret1","origins":["abc.com","rr.ru"]},{"client_secret":"cl_secret2"},{"server_secret":"sr_secret3"}]}`), | ||
| buildExpected(), | ||
| "", | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| actualTokenHolder, err := parseFromBytes(tt.input) | ||
| if tt.expectedErr != "" { | ||
| require.EqualError(t, err, tt.expectedErr, "Errors aren't equal") | ||
| } else { | ||
| require.NoError(t, err) | ||
| test.ObjectsEqual(t, tt.expected.ids, actualTokenHolder.ids, "Token holder ids aren't equal") | ||
| test.ObjectsEqual(t, tt.expected.all, actualTokenHolder.all, "Token holders all aren't equal") | ||
| test.ObjectsEqual(t, tt.expected.clientTokensOrigins, actualTokenHolder.clientTokensOrigins, "Token holders client tokens aren't equal") | ||
| test.ObjectsEqual(t, tt.expected.serverTokensOrigins, actualTokenHolder.serverTokensOrigins, "Token holders server tokens aren't equal") | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func buildExpected() *TokensHolder { | ||
| token1 := Token{ | ||
| Id: "id1", | ||
| ClientSecret: "cl_secret1", | ||
| ServerSecret: "sr_secret1", | ||
| Origins: []string{"abc.com", "rr.ru"}, | ||
| } | ||
| token2 := Token{ | ||
| Id: "31429624a471b9bdc6d60350c6cfc24d", | ||
| ClientSecret: "cl_secret2", | ||
| } | ||
| token3 := Token{ | ||
| Id: "03f9ed11a0268dd78766686f8f292b7b", | ||
| ServerSecret: "sr_secret3", | ||
| } | ||
| return &TokensHolder{ | ||
| clientTokensOrigins: map[string][]string{"cl_secret1": {"abc.com", "rr.ru"}, "cl_secret2": nil}, | ||
| serverTokensOrigins: map[string][]string{"sr_secret1": {"abc.com", "rr.ru"}, "sr_secret3": nil}, | ||
| ids: []string{"id1", "31429624a471b9bdc6d60350c6cfc24d", "03f9ed11a0268dd78766686f8f292b7b"}, | ||
| all: map[string]Token{ | ||
| "id1": token1, | ||
| "cl_secret1": token1, | ||
| "sr_secret1": token1, | ||
|
|
||
| "31429624a471b9bdc6d60350c6cfc24d": token2, | ||
| "cl_secret2": token2, | ||
|
|
||
| "03f9ed11a0268dd78766686f8f292b7b": token3, | ||
| "sr_secret3": token3, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func TestFromStrings(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| input []string | ||
| expected *TokensHolder | ||
| }{ | ||
| { | ||
| "empty tokens", | ||
| []string{}, | ||
| &TokensHolder{clientTokensOrigins: map[string][]string{}, serverTokensOrigins: map[string][]string{}, all: map[string]Token{}}, | ||
| }, | ||
| { | ||
| "value is string slice", | ||
| []string{"token1", "token2"}, | ||
| &TokensHolder{ | ||
| clientTokensOrigins: map[string][]string{"token1": nil, "token2": nil}, | ||
| serverTokensOrigins: map[string][]string{}, | ||
| all: map[string]Token{ | ||
| "78b1e6d775cec5260001af137a79dbd5": {Id: "78b1e6d775cec5260001af137a79dbd5", ClientSecret: "token1"}, | ||
| "token1": {Id: "78b1e6d775cec5260001af137a79dbd5", ClientSecret: "token1"}, | ||
|
|
||
| "0e0530c1430da76495955eb06eb99d95": {Id: "0e0530c1430da76495955eb06eb99d95", ClientSecret: "token2"}, | ||
| "token2": {Id: "0e0530c1430da76495955eb06eb99d95", ClientSecret: "token2"}, | ||
| }, | ||
| ids: []string{"78b1e6d775cec5260001af137a79dbd5", "0e0530c1430da76495955eb06eb99d95"}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| actual := fromStrings(tt.input) | ||
| test.ObjectsEqual(t, tt.expected, actual, "Token holders aren't equal") | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.