mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-21 22:56:55 +00:00
* sftpd: support SSH user certificates signed by a trusted CA Adds a new "certificate" auth method to weed sftp. When enabled, the server loads trusted CA public keys from -trustedUserCAKeysFile (OpenSSH authorized_keys format, one or more keys) and accepts only ssh.Certificate blobs of type UserCert on the public-key channel. Validation uses ssh.CertChecker: CA signature, ValidAfter/ValidBefore, non-empty ValidPrincipals and SSH login user must appear in ValidPrincipals. The authenticated user must exist in the user store; home dir and permissions resolve as before. Behaviour mirrors MinIO's --sftp=trusted-user-ca-key and OpenSSH's TrustedUserCAKeys: when certificate auth is active, plain (non-cert) public keys are rejected even if "publickey" is also listed. Default authMethods remain "password,publickey", so existing deployments are unaffected. * Update weed/sftpd/auth/certificate.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * sftpd: address review feedback on certificate auth - Pre-marshal trusted CA public keys in IsUserAuthority instead of re-marshaling on every authentication attempt (gemini-code-assist). - Differentiate user-not-found from underlying store errors via errors.As(*user.UserNotFoundError) so backend/read failures are no longer reported as bad credentials (coderabbitai). - Fix the corresponding sanity check in the missing-file test to use errors.As instead of errors.Is (UserNotFoundError has no Is method, so the previous check never matched) (coderabbitai). * sftpd: register trustedUserCAKeysFile flag in filer and server commands The new field on SftpOptions is dereferenced unconditionally in resolvePaths(), but only the standalone `weed sftp` command was wiring its flag. `weed filer` and `weed server` both embed an SftpOptions value and call resolvePaths() on it, so they hit a nil pointer dereference at startup. Register `-sftp.trustedUserCAKeysFile` in both commands and update the -sftp.authMethods help text to mention the new "certificate" method. Fixes the SFTP Integration Tests CI failure on this PR. * helm: expose SFTP certificate auth in the SeaweedFS chart Adds Helm-chart support for the new SSH user-certificate auth method: - values.yaml (sftp:) gains `trustedUserCAKeys` (inline OpenSSH authorized_keys-format CA public keys) and `existingCAKeysSecret` (reference an externally managed Secret). Same pair added under allInOne.sftp with a null default that falls back to the top-level sftp.* setting. - New template templates/sftp/sftp-ca-secret.yaml renders a chart-managed Secret <release>-sftp-ca-secret with `ca_user.pub`, but only when SFTP is enabled, "certificate" is in authMethods, inline keys are provided, and no existingCAKeysSecret is set. - templates/sftp/sftp-deployment.yaml and the all-in-one deployment template add `-trustedUserCAKeysFile=/etc/sw/sftp_ca/ca_user.pub` to the weed sftp command, mount the CA secret at /etc/sw/sftp_ca and add the corresponding volume. All cert-auth bits are guarded by `contains "certificate" authMethods` so existing users see no change. - authMethods help text updated to mention "certificate". Verified end-to-end on a local k3d cluster: cert login succeeds, plain-pubkey login is rejected with "public key without certificate not allowed". * helm: fail render when SFTP certificate auth lacks CA keys When certificate is in authMethods but neither trustedUserCAKeys nor existingCAKeysSecret is set, the deployment mounted a secret that the chart never renders, leaving the pod stuck on a missing volume. Fail at template time with a clear message instead. * sftpd: fix stale auth-method list in SFTPServiceOptions comment keyboard-interactive was never implemented; certificate is the new supported method. Match the CLI help text. * sftpd: test Manager wiring of certificate vs public-key channel Cover the channel takeover at the Manager level: certificate auth displaces plain public-key auth when both are enabled, public-key auth stays put otherwise, and enabling certificate without a CA file errors. --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Chris Lu <chris.lu@gmail.com>
313 lines
9.6 KiB
Go
313 lines
9.6 KiB
Go
package auth
|
|
|
|
import (
|
|
"crypto/ed25519"
|
|
"crypto/rand"
|
|
"errors"
|
|
"net"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/sftpd/user"
|
|
"golang.org/x/crypto/ssh"
|
|
)
|
|
|
|
// stubStore is a minimal user.Store for auth tests.
|
|
type stubStore struct {
|
|
users map[string]*user.User
|
|
}
|
|
|
|
func newStubStore(usernames ...string) *stubStore {
|
|
s := &stubStore{users: map[string]*user.User{}}
|
|
for _, name := range usernames {
|
|
s.users[name] = &user.User{Username: name}
|
|
}
|
|
return s
|
|
}
|
|
|
|
func (s *stubStore) GetUser(username string) (*user.User, error) {
|
|
if u, ok := s.users[username]; ok {
|
|
return u, nil
|
|
}
|
|
return nil, &user.UserNotFoundError{Username: username}
|
|
}
|
|
func (s *stubStore) ValidatePassword(string, []byte) bool { return false }
|
|
func (s *stubStore) ValidatePublicKey(string, string) bool { return false }
|
|
func (s *stubStore) GetUserPermissions(string, string) []string { return nil }
|
|
func (s *stubStore) SaveUser(*user.User) error { return nil }
|
|
func (s *stubStore) DeleteUser(string) error { return nil }
|
|
func (s *stubStore) ListUsers() ([]string, error) { return nil, nil }
|
|
|
|
// fakeConnMetadata satisfies ssh.ConnMetadata for the parts CertChecker uses.
|
|
type fakeConnMetadata struct {
|
|
user string
|
|
}
|
|
|
|
func (c *fakeConnMetadata) User() string { return c.user }
|
|
func (c *fakeConnMetadata) SessionID() []byte { return []byte("session") }
|
|
func (c *fakeConnMetadata) ClientVersion() []byte { return []byte("SSH-2.0-test") }
|
|
func (c *fakeConnMetadata) ServerVersion() []byte { return []byte("SSH-2.0-test") }
|
|
func (c *fakeConnMetadata) RemoteAddr() net.Addr { return &fakeAddr{} }
|
|
func (c *fakeConnMetadata) LocalAddr() net.Addr { return &fakeAddr{} }
|
|
|
|
type fakeAddr struct{}
|
|
|
|
func (fakeAddr) Network() string { return "tcp" }
|
|
func (fakeAddr) String() string { return "127.0.0.1:0" }
|
|
|
|
// testEnv bundles a CA, a user signer, and a temp dir for a single test.
|
|
type testEnv struct {
|
|
caSigner ssh.Signer
|
|
userSigner ssh.Signer
|
|
caKeyFile string
|
|
}
|
|
|
|
func newTestEnv(t *testing.T) *testEnv {
|
|
t.Helper()
|
|
|
|
_, caPriv, err := ed25519.GenerateKey(rand.Reader)
|
|
if err != nil {
|
|
t.Fatalf("ed25519 CA: %v", err)
|
|
}
|
|
caSigner, err := ssh.NewSignerFromKey(caPriv)
|
|
if err != nil {
|
|
t.Fatalf("ca signer: %v", err)
|
|
}
|
|
|
|
_, userPriv, err := ed25519.GenerateKey(rand.Reader)
|
|
if err != nil {
|
|
t.Fatalf("ed25519 user: %v", err)
|
|
}
|
|
userSigner, err := ssh.NewSignerFromKey(userPriv)
|
|
if err != nil {
|
|
t.Fatalf("user signer: %v", err)
|
|
}
|
|
|
|
dir := t.TempDir()
|
|
caFile := filepath.Join(dir, "ca_user.pub")
|
|
if err := os.WriteFile(caFile, ssh.MarshalAuthorizedKey(caSigner.PublicKey()), 0o600); err != nil {
|
|
t.Fatalf("write ca file: %v", err)
|
|
}
|
|
|
|
return &testEnv{caSigner: caSigner, userSigner: userSigner, caKeyFile: caFile}
|
|
}
|
|
|
|
// signCert produces a user cert signed by the test CA.
|
|
func (e *testEnv) signCert(t *testing.T, certType uint32, principals []string, validAfter, validBefore time.Time) *ssh.Certificate {
|
|
t.Helper()
|
|
cert := &ssh.Certificate{
|
|
Key: e.userSigner.PublicKey(),
|
|
CertType: certType,
|
|
ValidPrincipals: principals,
|
|
ValidAfter: uint64(validAfter.Unix()),
|
|
ValidBefore: uint64(validBefore.Unix()),
|
|
}
|
|
if err := cert.SignCert(rand.Reader, e.caSigner); err != nil {
|
|
t.Fatalf("sign cert: %v", err)
|
|
}
|
|
return cert
|
|
}
|
|
|
|
func TestCertificateAuthenticator_GoldenPath(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice")
|
|
|
|
a, err := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
if err != nil {
|
|
t.Fatalf("new: %v", err)
|
|
}
|
|
|
|
cert := env.signCert(t, ssh.UserCert, []string{"alice"},
|
|
time.Now().Add(-time.Minute), time.Now().Add(time.Hour))
|
|
|
|
perms, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert)
|
|
if err != nil {
|
|
t.Fatalf("Authenticate: %v", err)
|
|
}
|
|
if perms.Extensions["username"] != "alice" {
|
|
t.Fatalf("expected username extension alice, got %q", perms.Extensions["username"])
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsPlainPublicKey(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice")
|
|
|
|
a, err := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
if err != nil {
|
|
t.Fatalf("new: %v", err)
|
|
}
|
|
|
|
_, err = a.Authenticate(&fakeConnMetadata{user: "alice"}, env.userSigner.PublicKey())
|
|
if err == nil {
|
|
t.Fatal("expected rejection of plain public key, got nil")
|
|
}
|
|
if !strings.Contains(err.Error(), "public key without certificate") {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsHostCert(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice")
|
|
a, _ := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
|
|
cert := env.signCert(t, ssh.HostCert, []string{"alice"},
|
|
time.Now().Add(-time.Minute), time.Now().Add(time.Hour))
|
|
|
|
if _, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert); err == nil {
|
|
t.Fatal("expected rejection of host cert, got nil")
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsEmptyPrincipals(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice")
|
|
a, _ := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
|
|
cert := env.signCert(t, ssh.UserCert, nil,
|
|
time.Now().Add(-time.Minute), time.Now().Add(time.Hour))
|
|
|
|
_, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert)
|
|
if err == nil || !strings.Contains(err.Error(), "no valid principals") {
|
|
t.Fatalf("expected empty-principals rejection, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsWrongPrincipal(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice", "bob")
|
|
a, _ := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
|
|
cert := env.signCert(t, ssh.UserCert, []string{"bob"},
|
|
time.Now().Add(-time.Minute), time.Now().Add(time.Hour))
|
|
|
|
if _, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert); err == nil {
|
|
t.Fatal("expected wrong-principal rejection, got nil")
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsExpiredCert(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice")
|
|
a, _ := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
|
|
cert := env.signCert(t, ssh.UserCert, []string{"alice"},
|
|
time.Now().Add(-2*time.Hour), time.Now().Add(-time.Hour))
|
|
|
|
if _, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert); err == nil {
|
|
t.Fatal("expected expired-cert rejection, got nil")
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsUnknownCA(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore("alice")
|
|
a, _ := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
|
|
// Sign with a different CA.
|
|
_, otherCAPriv, _ := ed25519.GenerateKey(rand.Reader)
|
|
otherCASigner, _ := ssh.NewSignerFromKey(otherCAPriv)
|
|
|
|
cert := &ssh.Certificate{
|
|
Key: env.userSigner.PublicKey(),
|
|
CertType: ssh.UserCert,
|
|
ValidPrincipals: []string{"alice"},
|
|
ValidAfter: uint64(time.Now().Add(-time.Minute).Unix()),
|
|
ValidBefore: uint64(time.Now().Add(time.Hour).Unix()),
|
|
}
|
|
if err := cert.SignCert(rand.Reader, otherCASigner); err != nil {
|
|
t.Fatalf("sign: %v", err)
|
|
}
|
|
|
|
if _, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert); err == nil {
|
|
t.Fatal("expected unknown-CA rejection, got nil")
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_RejectsUnknownUser(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
store := newStubStore() // no users
|
|
a, _ := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
|
|
cert := env.signCert(t, ssh.UserCert, []string{"alice"},
|
|
time.Now().Add(-time.Minute), time.Now().Add(time.Hour))
|
|
|
|
_, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert)
|
|
if err == nil || !strings.Contains(err.Error(), "not found") {
|
|
t.Fatalf("expected user-not-found, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestCertificateAuthenticator_LoadsMultipleCAKeys(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
|
|
// Append a second CA pubkey to the file.
|
|
_, ca2Priv, _ := ed25519.GenerateKey(rand.Reader)
|
|
ca2Signer, _ := ssh.NewSignerFromKey(ca2Priv)
|
|
f, err := os.OpenFile(env.caKeyFile, os.O_APPEND|os.O_WRONLY, 0)
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
if _, err := f.Write(ssh.MarshalAuthorizedKey(ca2Signer.PublicKey())); err != nil {
|
|
t.Fatalf("write: %v", err)
|
|
}
|
|
f.Close()
|
|
|
|
store := newStubStore("alice")
|
|
a, err := NewCertificateAuthenticator(store, true, env.caKeyFile)
|
|
if err != nil {
|
|
t.Fatalf("new: %v", err)
|
|
}
|
|
if len(a.trustedCAs) != 2 {
|
|
t.Fatalf("expected 2 CAs, got %d", len(a.trustedCAs))
|
|
}
|
|
|
|
// A cert signed by the second CA should be accepted.
|
|
cert := &ssh.Certificate{
|
|
Key: env.userSigner.PublicKey(),
|
|
CertType: ssh.UserCert,
|
|
ValidPrincipals: []string{"alice"},
|
|
ValidAfter: uint64(time.Now().Add(-time.Minute).Unix()),
|
|
ValidBefore: uint64(time.Now().Add(time.Hour).Unix()),
|
|
}
|
|
if err := cert.SignCert(rand.Reader, ca2Signer); err != nil {
|
|
t.Fatalf("sign: %v", err)
|
|
}
|
|
if _, err := a.Authenticate(&fakeConnMetadata{user: "alice"}, cert); err != nil {
|
|
t.Fatalf("Authenticate with second CA: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestNewCertificateAuthenticator_DisabledIgnoresFile(t *testing.T) {
|
|
a, err := NewCertificateAuthenticator(newStubStore(), false, "")
|
|
if err != nil {
|
|
t.Fatalf("new: %v", err)
|
|
}
|
|
if a.Enabled() {
|
|
t.Fatal("expected disabled")
|
|
}
|
|
}
|
|
|
|
func TestNewCertificateAuthenticator_EnabledRequiresFile(t *testing.T) {
|
|
_, err := NewCertificateAuthenticator(newStubStore(), true, "")
|
|
if err == nil {
|
|
t.Fatal("expected error when enabled without file")
|
|
}
|
|
}
|
|
|
|
func TestNewCertificateAuthenticator_MissingFile(t *testing.T) {
|
|
_, err := NewCertificateAuthenticator(newStubStore(), true, filepath.Join(t.TempDir(), "nope.pub"))
|
|
if err == nil {
|
|
t.Fatal("expected error for missing file")
|
|
}
|
|
// Sanity: not a not-found-user-style error.
|
|
var notFound *user.UserNotFoundError
|
|
if errors.As(err, ¬Found) {
|
|
t.Fatalf("unexpected error type: %v", err)
|
|
}
|
|
}
|