github-starred/ollama-ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-04-28 00:40:20 -05:00
Code Issues 2.2k Packages Projects Releases 100 Wiki Activity

[PR #12373] [MERGED] auth: fix problems with the ollama keypairs #12539

New Issue
Closed
opened 2025-11-12 16:38:16 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-12 16:38:16 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/12373
Author: @pdevine
Created: 9/22/2025
Status: ✅ Merged
Merged: 9/23/2025
Merged by: @pdevine

Base: main ← Head: pdevine/pubkey-fixes

📝 Commits (6)

📊 Changes

6 files changed (+119 additions, -102 deletions)

View changed files

📝 api/client.go (+16 -8)
📝 api/types.go (+1 -1)
📝 auth/auth.go (+4 -36)
📝 cmd/cmd.go (+25 -31)
📝 cmd/cmd_test.go (+3 -0)
📝 server/routes.go (+70 -26)

📄 Description

This change adds several fixes including:

  • only reading the pubkey by the server
  • fixing the push unit test to create a keypair file in a temp directory
  • not return 500 errors for normal status error

This also carries #12361

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/12373 **Author:** [@pdevine](https://github.com/pdevine) **Created:** 9/22/2025 **Status:** ✅ Merged **Merged:** 9/23/2025 **Merged by:** [@pdevine](https://github.com/pdevine) **Base:** `main` ← **Head:** `pdevine/pubkey-fixes` --- ### 📝 Commits (6) - [`4eb1158`](https://github.com/ollama/ollama/commit/4eb1158202478582c4767b9af87a204fb7fa6a53) auth: fix problems with the ollama keypairs - [`9382bf9`](https://github.com/ollama/ollama/commit/9382bf9aa004e96b5869fea813973318a6aad336) comments - [`42191e1`](https://github.com/ollama/ollama/commit/42191e17377f6ae800e46e527a9c9f18aa2cea44) clean auth signing - [`ab1ff45`](https://github.com/ollama/ollama/commit/ab1ff4587c842e20ff18db0b4a0c17286f16271f) more change to simplify the api - [`8dd0a0c`](https://github.com/ollama/ollama/commit/8dd0a0c60526c0338f7df34e29f8021f0982c2de) feed the linter - [`b7d2724`](https://github.com/ollama/ollama/commit/b7d2724c22dd657c6d774dece4c7e1d1945fffba) comments ### 📊 Changes **6 files changed** (+119 additions, -102 deletions) <details> <summary>View changed files</summary> 📝 `api/client.go` (+16 -8) 📝 `api/types.go` (+1 -1) 📝 `auth/auth.go` (+4 -36) 📝 `cmd/cmd.go` (+25 -31) 📝 `cmd/cmd_test.go` (+3 -0) 📝 `server/routes.go` (+70 -26) </details> ### 📄 Description This change adds several fixes including: - only reading the pubkey by the server - fixing the push unit test to create a keypair file in a temp directory - not return 500 errors for normal status error This also carries #12361 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-12 16:38:16 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
client2
cloud
compatibility
context-length
create
docker
documentation
embeddings
engine
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
install
integration
intel
js
linux
macos
memory
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama-ollama#12539
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?