Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(pam/gdm): Fix and test handling of gdm qrcode regeneration #402

Merged
merged 14 commits into from
Jul 4, 2024
Merged

fix(pam/gdm): Fix and test handling of gdm qrcode regeneration #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e0e46e
pam/gdm/extension: Do not write debug output twice
3v1n0 Jun 27, 2024
023c6ce
pam/gdmmodel: Add test for basic qrcode authentication
3v1n0 Jun 27, 2024
4974081
pam/integration-tests/gdm: Increase timeout and do not end Pam transa…
3v1n0 Apr 7, 2024
a1b8127
pam/integration-tests/gdm: Rename authModeIDs to wantAuthModeIDs
3v1n0 Jun 27, 2024
05c533b
gdm-utils: Allow providing a formatted message to RequireEqualData check
3v1n0 Jun 27, 2024
7a77d33
pam/integration-tests/gdm: Always use unique user names in tests
3v1n0 Jun 27, 2024
0153852
pam/integration-tests/gdm: Also check for the current UI layout at au…
3v1n0 Jun 27, 2024
58f0335
pam/integration-tests/gdm: Mimic more the gdm behavior on auth events
3v1n0 Jun 27, 2024
e82ae9e
pam/gdm_test: Support replying to a GDM event with multiple events
3v1n0 Jun 27, 2024
5ac89c5
pam/integration-tests/gdm: Add simple test for qrcode authentication
3v1n0 Jun 27, 2024
f4ed03c
pam/gdmmodel: Support cancelling authentication all the times
3v1n0 Jun 27, 2024
c912c14
pam/gdmmodel: Reset the waiting authentication on reselect auth mode
3v1n0 Jun 27, 2024
7c4e2e4
pam/client-dummy: Add support for cancelling isAuthenticated request
3v1n0 Jun 27, 2024
fe1e2d5
pam/gdmmodel: Add test for regenerating Qr code
3v1n0 Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions examplebroker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ func (b *Broker) NewSession(ctx context.Context, username, lang, mode string) (s
exampleUsers[username] = userInfoBroker{Password: "goodpass"}
}

if _, ok := exampleUsers[username]; !ok && strings.HasPrefix(username, "user-mfa-integration") {
exampleUsers[username] = userInfoBroker{Password: "goodpass"}
info.neededAuthSteps = 3
}

pubASN1, err := x509.MarshalPKIXPublicKey(&b.privateKey.PublicKey)
if err != nil {
return "", "", err
Expand Down
42 changes: 38 additions & 4 deletions pam/integration-tests/gdm-module-handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ type gdmTestModuleHandler struct {

protoVersion uint32

supportedLayouts []*authd.UILayout
supportedLayouts []*authd.UILayout
currentUILayout *authd.UILayout
selectedUILayouts []*authd.UILayout

currentStage proto.Stage
pollResponses []*gdm.EventData
Expand Down Expand Up @@ -78,9 +80,19 @@ func (gh *gdmTestModuleHandler) exampleHandleGdmData(gdmData *gdm.Data) (*gdm.Da
func (gh *gdmTestModuleHandler) exampleHandleEvent(event *gdm.EventData) error {
events, ok := gh.eventPollResponses[event.Type]
if ok && len(events) > 0 {
pollResp := events[0]
gh.eventPollResponses[event.Type] = slices.Delete(events, 0, 1)
gh.pollResponses = append(gh.pollResponses, pollResp)
numEvents := 1
if events[0].Type == gdm_test.EventsGroupBegin().Type {
numEvents = slices.IndexFunc(events, func(ev *gdm.EventData) bool {
return ev.Type == gdm_test.EventsGroupEnd().Type
})
require.Greater(gh.t, numEvents, 1, "No valid events group found")
events = slices.Delete(events, numEvents, numEvents+1)
events = slices.Delete(events, 0, 1)
numEvents--
}
pollEvents := slices.Clone(events[0:numEvents])
gh.eventPollResponses[event.Type] = slices.Delete(events, 0, numEvents)
gh.pollResponses = append(gh.pollResponses, pollEvents...)
}

switch ev := event.Data.(type) {
Expand Down Expand Up @@ -126,6 +138,11 @@ func (gh *gdmTestModuleHandler) exampleHandleEvent(event *gdm.EventData) error {
if layout.Label != nil {
gh.t.Logf("%s:", *layout.Label)
}
if layout.Content != nil {
gh.t.Logf("%s:", *layout.Content)
}

gh.currentUILayout = layout

case *gdm.EventData_StartAuthentication:
idx := slices.IndexFunc(gh.authModes, func(mode *authd.GAMResponse_AuthenticationMode) bool {
Expand All @@ -142,6 +159,15 @@ func (gh *gdmTestModuleHandler) exampleHandleEvent(event *gdm.EventData) error {
"Selected authentication mode ID does not match expected one")
gh.selectedAuthModeIDs = slices.Delete(gh.selectedAuthModeIDs, 0, 1)

if len(gh.selectedUILayouts) < 1 {
// TODO: Make this an error but we don't support checking the layout in all tests yet.
return nil
}

gdm_test.RequireEqualData(gh.t, gh.selectedUILayouts[0], gh.currentUILayout,
"Selected UI layout does not match expected one")
gh.selectedUILayouts = slices.Delete(gh.selectedUILayouts, 0, 1)

case *gdm.EventData_AuthEvent:
gh.t.Logf("Authentication event: %s", ev.AuthEvent.Response)
if msg := ev.AuthEvent.Response.Msg; msg != "" {
Expand Down Expand Up @@ -173,6 +199,14 @@ func (gh *gdmTestModuleHandler) exampleHandleAuthDRequest(gdmData *gdm.Data) (*g
gh.currentStage = req.ChangeStage.Stage
log.Debugf(context.TODO(), "Switching to stage %d", gh.currentStage)

switch req.ChangeStage.Stage {
case proto.Stage_brokerSelection:
gh.authModes = nil
gh.brokerID = ""
case proto.Stage_authModeSelection:
gh.currentUILayout = nil
}

return &gdm.Data{
Type: gdm.DataType_response,
Response: &gdm.ResponseData{
Expand Down