Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions auth_requestor.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package secboot

import (
"context"
"errors"
"fmt"
"strings"
)
Expand Down Expand Up @@ -81,6 +82,8 @@ const (
UserAuthResultInvalidFormat
)

var ErrAuthRequestorNotAvailable = errors.New("the auth requestor is not available")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we mention this where relevant in the doc comments for AuthRequestor interface or the Auto one?


// AuthRequestor is an interface for requesting credentials.
type AuthRequestor interface {
// RequestUserCredential is used to request a user credential that is
Expand Down
106 changes: 106 additions & 0 deletions auth_requestor_auto.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
// -*- Mode: Go; indent-tabs-mode: t -*-

/*
* Copyright (C) 2026 Canonical Ltd
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

package secboot

import (
"context"
"errors"
"fmt"
"io"
)

var (
newPlymouthAuthRequestor = NewPlymouthAuthRequestor
newSystemdAuthRequestor = NewSystemdAuthRequestor
)

// AutoAuthRequestorStringer is used by the auto selecting implementation
// of [AuthRequestor] to obtain translated strings.
type AutoAuthRequestorStringer interface {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this different from the Plymouth one? should we just have one AuthRequestorStringer ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've merged these into one now.

// RequestUserCredentialString returns messages used by RequestUserCredential.
RequestUserCredentialString(name, path string, authTypes UserAuthType) (string, error)

// NotifyUserAuthResultString returns messages used by NotifyUserAuthResult.
NotifyUserAuthResultString(name, path string, result UserAuthResult, authTypes, exhaustedAuthTypes UserAuthType) (string, error)
}

type autoAuthRequestor struct {
requestors []AuthRequestor
lastUsed AuthRequestor
}

func (r *autoAuthRequestor) RequestUserCredential(ctx context.Context, name, path string, authTypes UserAuthType) (string, UserAuthType, error) {
for _, req := range r.requestors {
switch cred, credType, err := req.RequestUserCredential(ctx, name, path, authTypes); {
case err == nil:
r.lastUsed = req
fallthrough
case !errors.Is(err, ErrAuthRequestorNotAvailable):
return cred, credType, err
}
}

return "", 0, ErrAuthRequestorNotAvailable
}

func (r *autoAuthRequestor) NotifyUserAuthResult(ctx context.Context, result UserAuthResult, authTypes, exhaustedAuthTypes UserAuthType) error {
if r.lastUsed == nil {
return errors.New("no user credential requested yet")
}
return r.lastUsed.NotifyUserAuthResult(ctx, result, authTypes, exhaustedAuthTypes)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems because of the ping in the plymouth implementation that this could return ErrAuthRequestorNotAvailable ? is that expected, should it be documented? what should the caller do in that case?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if plymouth stops in the middle, it is a weird enough context that we should completely fail and just log that error.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the error just gets logged in this case. To be honest, the ping is probably a bit redundant (assuming that plymouth display-message returns a non-zero exit code in this case).

}

// NewAutoAuthRequestor creates an implementation of AuthRequestor that automatically
// selects the first available implementation in the following order:
// - Plymouth.
// - systemd-ask-password.
//
// The caller supplies an implementation of AutoAuthRequestorStringer that returns messages.
// The console argument is used by the systemd-ask-password implementation of
// [AuthRequestor.NotifyUserAuthResult] where result is not [UserAuthResultSuccess]. If not
// provided, it defaults to [os.Stderr].
func NewAutoAuthRequestor(stderr io.Writer, stringer AutoAuthRequestorStringer) (AuthRequestor, error) {
var requestors []AuthRequestor
switch ply, err := newPlymouthAuthRequestor(stringer); {
case errors.Is(err, ErrAuthRequestorNotAvailable):
// ignore
case err != nil:
return nil, fmt.Errorf("cannot create Plymouth AuthRequestor: %w", err)
default:
requestors = append(requestors, ply)
}

switch sd, err := newSystemdAuthRequestor(stderr, func(name, path string, authTypes UserAuthType) (string, error) {
return stringer.RequestUserCredentialString(name, path, authTypes)
}); {
case errors.Is(err, ErrAuthRequestorNotAvailable):
// ignore
case err != nil:
return nil, fmt.Errorf("cannot create systemd AuthRequestor: %w", err)
default:
requestors = append(requestors, sd)
}

if len(requestors) == 0 {
return nil, ErrAuthRequestorNotAvailable
}

return &autoAuthRequestor{requestors: requestors}, nil
}
Loading
Loading