Skip to content

Commit 18be398

Browse files
tinaboycetinaboyce
authored
Merge branch 'master' into dependabot/go_modules/golang.org/x/crypto-0.31.0
2 parents 584ff9e + 9e77596 commit 18be398

File tree

10 files changed

+271
-38
lines changed

10 files changed

+271
-38
lines changed

‎.github/workflows/go.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ubuntu-latest, macOS-latest, macos-12]
15+
os: [ubuntu-latest, macOS-latest, macos-13]
1616
steps:
1717
- name: Check out code into the Go module directory
1818
uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
7676

7777
- uses: actions/download-artifact@v4
7878
with:
79-
name: macos-12_reports
79+
name: macos-13_reports
8080
path: reports
8181

8282
- name: Codecov

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARCH=$(shell uname -m)
33
OS?=$(shell uname)
44
ITERATION := 1
55

6-
GOLANGCI_VERSION = 1.53.2
6+
GOLANGCI_VERSION = 1.55.2
77
GORELEASER := $(shell command -v goreleaser 2> /dev/null)
88

99
SOURCE_FILES?=$$(go list ./... | grep -v /vendor/)
@@ -42,7 +42,7 @@ fmt: lint-fix
4242

4343
install:
4444
go install ./cmd/saml2aws
45-
.PHONY: mod
45+
.PHONY: install
4646

4747
build:
4848

@@ -80,4 +80,4 @@ test:
8080
docker-build-environment:
8181
docker build --platform=amd64 -t saml2aws/build -f Dockerfile.build .
8282
docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -e BUILDX_CONFIG=$(PWD)/.buildtemp -e GOPATH=$(PWD)/.buildtemp -e GOTMPDIR=$(PWD)/.buildtemp -e GOCACHE=$(PWD)/.buildtemp/.cache -e GOENV=$(PWD)/.buildtemp/env -v $(PWD):$(PWD) -w $(PWD) saml2aws/build:latest
83-
.PHONY: docker-build-environment
83+
.PHONY: docker-build-environment

‎cmd/saml2aws/commands/login.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
// Login login to ADFS
2727
func Login(loginFlags *flags.LoginExecFlags) error {
28-
2928
logger := logrus.WithField("command", "login")
3029

3130
account, err := buildIdpAccount(loginFlags)
@@ -258,6 +257,11 @@ func resolveLoginDetails(account *cfg.IDPAccount, loginFlags *flags.LoginExecFla
258257
loginDetails.DownloadBrowser = account.DownloadBrowser
259258
}
260259

260+
// parse KCBroker if set
261+
if account.KCBroker != "" {
262+
loginDetails.KCBroker = account.KCBroker
263+
}
264+
261265
// log.Printf("loginDetails %+v", loginDetails)
262266

263267
// if skip prompt was passed just pass back the flag values

‎cmd/saml2aws/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func main() {
9191
app.Flag("disable-keychain", "Do not use keychain at all. This will also disable Okta sessions & remembering MFA device. (env: SAML2AWS_DISABLE_KEYCHAIN)").Envar("SAML2AWS_DISABLE_KEYCHAIN").BoolVar(&commonFlags.DisableKeychain)
9292
app.Flag("region", "AWS region to use for API requests, e.g. us-east-1, us-gov-west-1, cn-north-1 (env: SAML2AWS_REGION)").Envar("SAML2AWS_REGION").Short('r').StringVar(&commonFlags.Region)
9393
app.Flag("prompter", "The prompter to use for user input (default, pinentry)").StringVar(&commonFlags.Prompter)
94+
app.Flag("kc-broker", "The kc broker to use when authenticating via keycloak").StringVar(&commonFlags.KCBroker)
9495

9596
// `configure` command and settings
9697
cmdConfigure := app.Command("configure", "Configure a new IDP account.")
@@ -190,7 +191,6 @@ func main() {
190191
http.DefaultTransport.(*http.Transport).Proxy = http.ProxyFromEnvironment
191192

192193
logrus.WithField("command", command).Debug("Running")
193-
194194
var err error
195195
switch command {
196196
case cmdScript.FullCommand():

‎pkg/cfg/cfg.go

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type IDPAccount struct {
6969
Prompter string `ini:"prompter"`
7070
KCAuthErrorMessage string `ini:"kc_auth_error_message,omitempty"` // used by KeyCloak; hide from user if not set
7171
KCAuthErrorElement string `ini:"kc_auth_error_element,omitempty"` // used by KeyCloak; hide from user if not set
72+
KCBroker string `ini:"kc_broker"` // used by KeyCloak;
7273
}
7374

7475
func (ia IDPAccount) String() string {

‎pkg/creds/creds.go

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ type LoginDetails struct {
1313
URL string
1414
StateToken string // used by Okta
1515
OktaSessionCookie string // used by Okta
16+
KCBroker string // used by KeyCloak
1617
}

‎pkg/flags/flags.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ type CommonFlags struct {
3939
DisableRememberDevice bool
4040
DisableSessions bool
4141
Prompter string
42+
KCBroker string
4243
}
4344

4445
// LoginExecFlags flags for the Login / Exec commands
@@ -147,7 +148,9 @@ func ApplyFlagOverrides(commonFlags *CommonFlags, account *cfg.IDPAccount) {
147148
if commonFlags.Prompter != "" {
148149
account.Prompter = commonFlags.Prompter
149150
}
150-
151+
if commonFlags.KCBroker != "" {
152+
account.KCBroker = commonFlags.KCBroker
153+
}
151154
// select the prompter
152155
if commonFlags.Prompter != "" {
153156
account.Prompter = commonFlags.Prompter

‎pkg/provider/keycloak/example/authError-invalidPassword-v2.html

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
<!DOCTYPE html>
2+
<html class="login-pf" lang="en">
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
7+
<meta name="robots" content="noindex, nofollow">
8+
<meta name="color-scheme" content="light dark">
9+
<meta name="viewport" content="width=device-width, initial-scale=1">
10+
11+
<title>Sign in to internal</title>
12+
<link rel="icon" href="/resources/kb6gy/login/keycloak.v2/img/favicon.ico" />
13+
<link href="/resources/kb6gy/common/keycloak/vendor/patternfly-v5/patternfly.min.css" rel="stylesheet" />
14+
<link href="/resources/kb6gy/common/keycloak/vendor/patternfly-v5/patternfly-addons.css" rel="stylesheet" />
15+
<link href="/resources/kb6gy/login/keycloak.v2/css/styles.css" rel="stylesheet" />
16+
<script type="importmap">
17+
{
18+
"imports": {
19+
"rfc4648": "/resources/kb6gy/common/keycloak/vendor/rfc4648/rfc4648.js"
20+
}
21+
}
22+
</script>
23+
<script type="module" async blocking="render">
24+
const DARK_MODE_CLASS = "pf-v5-theme-dark";
25+
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
26+
27+
updateDarkMode(mediaQuery.matches);
28+
mediaQuery.addEventListener("change", (event) => updateDarkMode(event.matches));
29+
30+
function updateDarkMode(isEnabled) {
31+
const { classList } = document.documentElement;
32+
33+
if (isEnabled) {
34+
classList.add(DARK_MODE_CLASS);
35+
} else {
36+
classList.remove(DARK_MODE_CLASS);
37+
}
38+
}
39+
</script>
40+
<script type="module" src="/resources/kb6gy/login/keycloak.v2/js/passwordVisibility.js"></script>
41+
<script type="module">
42+
import { startSessionPolling } from "/resources/kb6gy/login/keycloak.v2/js/authChecker.js";
43+
44+
startSessionPolling(
45+
"/realms/internal/login-actions/restart?client_id=urn%3Aamazon%3Awebservices&tab_id=tabId&client_data=clientData&skip_logout=true"
46+
);
47+
</script>
48+
<script type="module">
49+
import { checkAuthSession } from "/resources/kb6gy/login/keycloak.v2/js/authChecker.js";
50+
51+
checkAuthSession(
52+
"sessionId"
53+
);
54+
</script>
55+
<script>
56+
// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1404468
57+
const isFirefox = true;
58+
</script>
59+
<SCRIPT> if (typeof history.replaceState === 'function') { history.replaceState({}, "some title", "https://my.domain/realms/internal/login-actions/authenticate?execution=uuid&client_id=urn%3Aamazon%3Awebservices&tab_id=tabId&client_data=clientData"); }</SCRIPT></head>
60+
61+
<body id="keycloak-bg" class="">
62+
<div class="pf-v5-c-login">
63+
<div class="pf-v5-c-login__container">
64+
<header id="kc-header" class="pf-v5-c-login__header">
65+
<div id="kc-header-wrapper"
66+
class="pf-v5-c-brand">internal</div>
67+
</header>
68+
<main class="pf-v5-c-login__main">
69+
<div class="pf-v5-c-login__main-header">
70+
<h1 class="pf-v5-c-title pf-m-3xl" id="kc-page-title"><!-- template: login.ftl -->
71+
72+
Sign in to your account
73+
74+
</h1>
75+
</div>
76+
<div class="pf-v5-c-login__main-body">
77+
78+
79+
<!-- template: login.ftl -->
80+
81+
<div id="kc-form">
82+
<div id="kc-form-wrapper">
83+
<form id="kc-form-login" class="pf-v5-c-form" onsubmit="login.disabled = true; return true;" action="https://my.domain/realms/internal/login-actions/authenticate?session_code=sessionId&amp;execution=uuid&amp;client_id=urn%3Aamazon%3Awebservices&amp;tab_id=tabId&amp;client_data=clientData" method="post" novalidate="novalidate">
84+
85+
<div class="pf-v5-c-form__group">
86+
<div class="pf-v5-c-form__label">
87+
<label for="username" class="pf-v5-c-form__label">
88+
<span class="pf-v5-c-form__label-text">
89+
Username or email
90+
91+
</span>
92+
</label>
93+
</div>
94+
95+
<span class="pf-v5-c-form-control pf-m-error">
96+
<input id="username" name="username" value="aorlovskiy" type="text" autocomplete="username" autofocus
97+
aria-invalid="true"/>
98+
<span class="pf-v5-c-form-control__utilities">
99+
<span class="pf-v5-c-form-control__icon pf-m-status">
100+
<i class="fas fa-exclamation-circle" aria-hidden="true"></i>
101+
</span>
102+
</span>
103+
</span>
104+
105+
<div id="input-error-container-username">
106+
<div class="pf-v5-c-form__helper-text" aria-live="polite">
107+
<div class="pf-v5-c-helper-text">
108+
<div class="pf-v5-c-helper-text__item pf-m-error" id="input-error-username">
109+
<span class="pf-v5-c-helper-text__item-text pf-m-error kc-feedback-text">
110+
Invalid username or password.
111+
</span>
112+
</div>
113+
</div>
114+
</div>
115+
</div>
116+
</div>
117+
118+
119+
<div class="pf-v5-c-form__group">
120+
<div class="pf-v5-c-form__label">
121+
<label for="password" class="pf-v5-c-form__label">
122+
<span class="pf-v5-c-form__label-text">
123+
Password
124+
</span>
125+
</label>
126+
</div>
127+
128+
<div class="pf-v5-c-input-group">
129+
<div class="pf-v5-c-input-group__item pf-m-fill">
130+
<span class="pf-v5-c-form-control ">
131+
<input id="password" name="password" value="" type="password" autocomplete="current-password"
132+
aria-invalid=""/>
133+
</span>
134+
</div>
135+
<div class="pf-v5-c-input-group__item">
136+
<button class="pf-v5-c-button pf-m-control" type="button" aria-label="Show password"
137+
aria-controls="password" data-password-toggle
138+
data-icon-show="fa-eye fas" data-icon-hide="fa-eye-slash fas"
139+
data-label-show="Show password" data-label-hide="Hide password">
140+
<i class="fa-eye fas" aria-hidden="true"></i>
141+
</button>
142+
</div>
143+
</div>
144+
145+
<div id="input-error-container-password">
146+
</div>
147+
</div>
148+
149+
150+
<div class="pf-v5-c-form__group">
151+
</div>
152+
153+
<input type="hidden" id="id-hidden-input" name="credentialId" />
154+
<div class="pf-v5-c-form__group">
155+
<div class="pf-v5-c-form__actions">
156+
<button class="pf-v5-c-button pf-m-primary pf-m-block " name="login" id="kc-login" type="submit">Sign In</button>
157+
</div>
158+
</div>
159+
</form>
160+
</div>
161+
</div>
162+
163+
164+
165+
</div>
166+
<div class="pf-v5-c-login__main-footer">
167+
<!-- template: login.ftl -->
168+
169+
170+
</div>
171+
</main>
172+
173+
</div>
174+
</div>
175+
</html>

0 commit comments

Comments
 (0)