Skip to content

Commit ca2d8d4

Browse files
0raxGearheads
authored andcommitted
fix: Browser IDP & MFA support using saml2aws/v2
Signed-off-by: JP Roemer <[email protected]>
1 parent 6783019 commit ca2d8d4

File tree

12 files changed

+124
-151
lines changed

12 files changed

+124
-151
lines changed

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "third_party/saml2aws"]
2-
path = third_party/saml2aws
3-
url = https://github.com/richardcase/saml2aws.git
4-
branch = ntlmchanges

CONTRIBUTING.md

+7-13
Original file line numberDiff line numberDiff line change
@@ -58,34 +58,28 @@ When choosing an issue to work on its preferable that you choose a issue that is
5858
git checkout -b <feature-name>
5959
```
6060

61-
4. Use `git submodule` for saml2aws third party dependency
62-
63-
```bash
64-
git submodule update --init --recursive
65-
```
66-
67-
5. Make the change, including any additional tests
68-
6. Run the tests:
61+
4. Make the change, including any additional tests
62+
5. Run the tests:
6963

7064
```bash
7165
make test
7266
```
7367

74-
7. Check for linting errors:
68+
6. Check for linting errors:
7569

7670
```bash
7771
make lint
7872
```
7973

80-
8. Build and manually test kconnect locally:
74+
7. Build and manually test kconnect locally:
8175

8276
```bash
8377
make build
8478
```
8579

86-
9. Commit and push your branch. We follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for the commits and PRs. .
87-
10. Create a pull request. If the PR is a work in progress ensure that that **PR is created as a draft**.
88-
11. Check that the PR checks pass
80+
8. Commit and push your branch. We follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for the commits and PRs.
81+
9. Create a pull request. If the PR is a work in progress ensure that that **PR is created as a draft**.
82+
10. Check that the PR checks pass
8983

9084
Once a PR has been created it will be reviewed by one of the maintainers of kconnect.
9185

go.mod

+24-24
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ require (
99
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
1010
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
1111
github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
12-
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
13-
github.com/PuerkitoBio/goquery v1.5.1 // indirect
14-
github.com/andybalholm/cascadia v1.2.0 // indirect
15-
github.com/aws/aws-sdk-go v1.49.16
16-
github.com/beevik/etree v1.2.0
12+
github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
13+
github.com/PuerkitoBio/goquery v1.9.1 // indirect
14+
github.com/andybalholm/cascadia v1.3.2 // indirect
15+
github.com/aws/aws-sdk-go v1.50.36
16+
github.com/beevik/etree v1.3.0
1717
github.com/blang/semver v3.5.1+incompatible
1818
github.com/brianvoe/gofakeit/v5 v5.11.2
1919
github.com/go-playground/validator/v10 v10.16.0
2020
github.com/golang/mock v1.6.0
2121
github.com/google/go-github v17.0.0+incompatible
2222
github.com/google/go-querystring v1.0.0 // indirect
2323
github.com/google/gofuzz v1.2.0 // indirect
24-
github.com/google/uuid v1.5.0
24+
github.com/google/uuid v1.6.0
2525
github.com/imdario/mergo v0.3.10 // indirect
26-
github.com/marshallbrekka/go-u2fhost v0.0.0-20200114212649-cc764c209ee9 // indirect
26+
github.com/marshallbrekka/go-u2fhost v0.0.0-20210111072507-3ccdec8c8105 // indirect
2727
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
2828
github.com/mitchellh/go-homedir v1.1.0
2929
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -36,10 +36,10 @@ require (
3636
github.com/spf13/cobra v1.7.0
3737
github.com/spf13/pflag v1.0.5
3838
github.com/spf13/viper v1.18.1
39-
github.com/versent/saml2aws v1.8.5-0.20200622110128-d94772688a70
40-
go.uber.org/multierr v1.10.0 // indirect
39+
github.com/versent/saml2aws/v2 v2.36.14
40+
go.uber.org/multierr v1.11.0 // indirect
4141
go.uber.org/zap v1.26.0
42-
golang.org/x/crypto v0.17.0 // indirect
42+
golang.org/x/crypto v0.21.0 // indirect
4343
golang.org/x/mod v0.14.0
4444
gopkg.in/ini.v1 v1.67.0
4545
gopkg.in/yaml.v2 v2.4.0
@@ -58,14 +58,18 @@ require (
5858
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
5959
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6060
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
61-
github.com/avast/retry-go v2.6.0+incompatible // indirect
61+
github.com/avast/retry-go v3.0.0+incompatible // indirect
62+
github.com/bearsh/hid v1.3.0 // indirect
6263
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
64+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
6365
github.com/dimchansky/utfbom v1.1.1 // indirect
6466
github.com/fsnotify/fsnotify v1.7.0 // indirect
6567
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
68+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
6669
github.com/go-logr/logr v1.3.0 // indirect
6770
github.com/go-playground/locales v0.14.1 // indirect
6871
github.com/go-playground/universal-translator v0.18.1 // indirect
72+
github.com/go-stack/stack v1.8.1 // indirect
6973
github.com/gogo/protobuf v1.3.2 // indirect
7074
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
7175
github.com/golang/protobuf v1.5.3 // indirect
@@ -74,7 +78,6 @@ require (
7478
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7579
github.com/jmespath/go-jmespath v0.4.0 // indirect
7680
github.com/json-iterator/go v1.1.12 // indirect
77-
github.com/karalabe/hid v1.0.0 // indirect
7881
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
7982
github.com/leodido/go-urn v1.2.4 // indirect
8083
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
@@ -84,25 +87,25 @@ require (
8487
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
8588
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8689
github.com/modern-go/reflect2 v1.0.2 // indirect
87-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
8890
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
91+
github.com/playwright-community/playwright-go v0.4201.0 // indirect
8992
github.com/sagikazarmark/locafero v0.4.0 // indirect
9093
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
9194
github.com/sourcegraph/conc v0.3.0 // indirect
9295
github.com/subosito/gotenv v1.6.0 // indirect
93-
github.com/tidwall/gjson v1.9.3 // indirect
96+
github.com/tidwall/gjson v1.17.1 // indirect
9497
github.com/tidwall/match v1.1.1 // indirect
95-
github.com/tidwall/pretty v1.2.0 // indirect
96-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
97-
golang.org/x/net v0.19.0 // indirect
98+
github.com/tidwall/pretty v1.2.1 // indirect
99+
github.com/trimble-oss/go-webauthn-client v0.3.0 // indirect
100+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
101+
golang.org/x/net v0.22.0 // indirect
98102
golang.org/x/oauth2 v0.15.0 // indirect
99-
golang.org/x/sys v0.15.0 // indirect
100-
golang.org/x/term v0.15.0 // indirect
103+
golang.org/x/sys v0.18.0 // indirect
104+
golang.org/x/term v0.18.0 // indirect
101105
golang.org/x/text v0.14.0 // indirect
102106
golang.org/x/time v0.5.0 // indirect
103107
google.golang.org/appengine v1.6.7 // indirect
104108
google.golang.org/protobuf v1.31.0 // indirect
105-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
106109
gopkg.in/inf.v0 v0.9.1 // indirect
107110
gopkg.in/yaml.v3 v3.0.1 // indirect
108111
k8s.io/klog/v2 v2.110.1 // indirect
@@ -111,7 +114,4 @@ require (
111114
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
112115
)
113116

114-
replace (
115-
github.com/spf13/cobra => github.com/richardcase/cobra v1.0.1-0.20200717133916-3a09287ba25e
116-
github.com/versent/saml2aws => ./third_party/saml2aws
117-
)
117+
replace github.com/spf13/cobra => github.com/richardcase/cobra v1.0.1-0.20200717133916-3a09287ba25e

0 commit comments

Comments
 (0)