64883e3c4c
release / setup-environment (push) Has been cancelled
release / windows-depends (amd64, -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-parallel-jobs=4 -Wno-ignored-attributes -Wno-deprecated-pragma" -DCMAKE_CXX_FLAGS="-parallel-jobs=4 -Wno-ignored-attributes -Wno-deprecated-pragma", https:/… (push) Has been cancelled
release / windows-depends (amd64, ["cudart" "nvcc" "cublas" "cublas_dev" "crt" "nvvm" "nvptxcompiler"], 13.0, , https://developer.download.nvidia.com/compute/cuda/13.0.0/local_installers/cuda_13.0.0_windows.exe, windows, CUDA 13, cuda_v13) (push) Has been cancelled
release / windows-depends (amd64, ["cudart" "nvcc" "cublas" "cublas_dev"], 12.8, , https://developer.download.nvidia.com/compute/cuda/12.8.0/local_installers/cuda_12.8.0_571.96_windows.exe, windows, CUDA 12, cuda_v12) (push) Has been cancelled
release / windows-depends (amd64, windows, CPU) (push) Has been cancelled
release / darwin-build (amd64, darwin) (push) Has been cancelled
release / darwin-build (arm64, darwin) (push) Has been cancelled
release / windows-build (amd64, windows) (push) Has been cancelled
release / windows-build (arm64, windows) (push) Has been cancelled
release / linux-build (amd64, linux, archive) (push) Has been cancelled
release / linux-build (amd64, linux, rocm) (push) Has been cancelled
release / linux-build (arm64, linux, archive) (push) Has been cancelled
release / docker-build-push (amd64, CGO_CFLAGS
CGO_CXXFLAGS
GOFLAGS
, linux) (push) Has been cancelled
release / docker-build-push (amd64, CGO_CFLAGS
CGO_CXXFLAGS
GOFLAGS
FLAVOR=rocm
, linux, -rocm) (push) Has been cancelled
release / docker-build-push (arm64, CGO_CFLAGS
CGO_CXXFLAGS
GOFLAGS
, linux) (push) Has been cancelled
release / docker-merge-push () (push) Has been cancelled
release / docker-merge-push (-rocm) (push) Has been cancelled
release / trigger (push) Has been cancelled
* auth: fix problems with the ollama keypairs This change adds several fixes including: - reading in the pubkey files correctly - fixing the push unit test to create a keypair file in a temp directory - not return 500 errors for normal status error
86 lines
1.8 KiB
Go
86 lines
1.8 KiB
Go
package auth
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/rand"
|
|
"encoding/base64"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"golang.org/x/crypto/ssh"
|
|
)
|
|
|
|
const defaultPrivateKey = "id_ed25519"
|
|
|
|
func GetPublicKey() (string, error) {
|
|
home, err := os.UserHomeDir()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
keyPath := filepath.Join(home, ".ollama", defaultPrivateKey)
|
|
privateKeyFile, err := os.ReadFile(keyPath)
|
|
if err != nil {
|
|
slog.Info(fmt.Sprintf("Failed to load private key: %v", err))
|
|
return "", err
|
|
}
|
|
|
|
privateKey, err := ssh.ParsePrivateKey(privateKeyFile)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
publicKey := ssh.MarshalAuthorizedKey(privateKey.PublicKey())
|
|
|
|
return strings.TrimSpace(string(publicKey)), nil
|
|
}
|
|
|
|
func NewNonce(r io.Reader, length int) (string, error) {
|
|
nonce := make([]byte, length)
|
|
if _, err := io.ReadFull(r, nonce); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return base64.RawURLEncoding.EncodeToString(nonce), nil
|
|
}
|
|
|
|
func Sign(ctx context.Context, bts []byte) (string, error) {
|
|
home, err := os.UserHomeDir()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
keyPath := filepath.Join(home, ".ollama", defaultPrivateKey)
|
|
privateKeyFile, err := os.ReadFile(keyPath)
|
|
if err != nil {
|
|
slog.Info(fmt.Sprintf("Failed to load private key: %v", err))
|
|
return "", err
|
|
}
|
|
|
|
privateKey, err := ssh.ParsePrivateKey(privateKeyFile)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
// get the pubkey, but remove the type
|
|
publicKey := ssh.MarshalAuthorizedKey(privateKey.PublicKey())
|
|
parts := bytes.Split(publicKey, []byte(" "))
|
|
if len(parts) < 2 {
|
|
return "", errors.New("malformed public key")
|
|
}
|
|
|
|
signedData, err := privateKey.Sign(rand.Reader, bts)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
// signature is <pubkey>:<signature>
|
|
return fmt.Sprintf("%s:%s", bytes.TrimSpace(parts[1]), base64.StdEncoding.EncodeToString(signedData.Blob)), nil
|
|
}
|