-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auth: add www-authenticate based on user agent (#1350)
- Loading branch information
Showing
5 changed files
with
193 additions
and
32 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| Enhancement: Add auth protocol based on user agent | ||
|
|
||
| Previously, all available credential challenges are given to the client, | ||
| for example, basic auth, bearer token, etc ... | ||
| Different clients have different priorities to use one method or another, | ||
| and before it was not possible to force a client to use one method without | ||
| having a side effect on other clients. | ||
|
|
||
| This PR adds the functionality to target a specific auth protocol based | ||
| on the user agent HTTP header. | ||
|
|
||
| https://github.com/cs3org/reva/pull/1350 |
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,109 @@ | ||
| // Copyright 2018-2020 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| package auth | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestGetCredsForUserAgent(t *testing.T) { | ||
| type test struct { | ||
| userAgent string | ||
| userAgentMap map[string]string | ||
| availableCredentials []string | ||
| expected []string | ||
| } | ||
|
|
||
| tests := []*test{ | ||
| // no user agent we return all available credentials | ||
| &test{ | ||
| userAgent: "", | ||
| userAgentMap: map[string]string{}, | ||
| availableCredentials: []string{"basic"}, | ||
| expected: []string{"basic"}, | ||
| }, | ||
|
|
||
| // map set but user agent not in map | ||
| &test{ | ||
| userAgent: "curl", | ||
| userAgentMap: map[string]string{"mirall": "basic"}, | ||
| availableCredentials: []string{"basic", "bearer"}, | ||
| expected: []string{"basic", "bearer"}, | ||
| }, | ||
|
|
||
| // no user map we return all available credentials | ||
| &test{ | ||
| userAgent: "mirall", | ||
| userAgentMap: map[string]string{}, | ||
| availableCredentials: []string{"basic"}, | ||
| expected: []string{"basic"}, | ||
| }, | ||
|
|
||
| // user agent set but no mapping set we return all credentials | ||
| &test{ | ||
| userAgent: "mirall", | ||
| userAgentMap: map[string]string{}, | ||
| availableCredentials: []string{"basic"}, | ||
| expected: []string{"basic"}, | ||
| }, | ||
|
|
||
| // user mapping set to non available credential, we return all available | ||
| &test{ | ||
| userAgent: "mirall", | ||
| userAgentMap: map[string]string{"mirall": "notfound"}, | ||
| availableCredentials: []string{"basic", "bearer"}, | ||
| expected: []string{"basic", "bearer"}, | ||
| }, | ||
|
|
||
| // user mapping set and we return only desired credential | ||
| &test{ | ||
| userAgent: "mirall", | ||
| userAgentMap: map[string]string{"mirall": "bearer"}, | ||
| availableCredentials: []string{"basic", "bearer"}, | ||
| expected: []string{"bearer"}, | ||
| }, | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| got := getCredsForUserAgent( | ||
| test.userAgent, | ||
| test.userAgentMap, | ||
| test.availableCredentials) | ||
|
|
||
| if !match(got, test.expected) { | ||
| fail(t, got, test.expected) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func match(a, b []string) bool { | ||
| if len(a) != len(b) { | ||
| return false | ||
| } | ||
| for i, v := range a { | ||
| if v != b[i] { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| func fail(t *testing.T, got, expected []string) { | ||
| t.Fatalf("got: %+v expected: %+v", got, expected) | ||
| } |