src/up
1
0
Fork 0
mirror of https://github.com/coalaura/up.git synced 2025-07-17 21:44:35 +00:00
Code Activity

better server logging

Browse Source
This commit is contained in:
Laura
2025-06-20 16:23:12 +02:00
parent 602e327d03
commit 5fdce93157
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/protocol.go
View File

@ -32,6 +32,8 @@ func IsSignatureFormatValid(format string) bool {
} }
func HandleChallengeRequest(w http.ResponseWriter, r *http.Request, authorized map[string]ssh.PublicKey) { func HandleChallengeRequest(w http.ResponseWriter, r *http.Request, authorized map[string]ssh.PublicKey) {
log.Printf("request: new request from %s\n", r.RemoteAddr)
var request internal.AuthRequest var request internal.AuthRequest
if err := msgpack.NewDecoder(r.Body).Decode(&request); err != nil { if err := msgpack.NewDecoder(r.Body).Decode(&request); err != nil {
@ -69,13 +71,15 @@ func HandleChallengeRequest(w http.ResponseWriter, r *http.Request, authorized m
Expires: time.Now().Add(20 * time.Second), Expires: time.Now().Add(20 * time.Second),
}) })
log.Println("new auth request") log.Printf("request: issued challenge to %s\n", r.RemoteAddr)
w.Header().Set("Content-Type", "application/msgpack") w.Header().Set("Content-Type", "application/msgpack")
msgpack.NewEncoder(w).Encode(challenge) msgpack.NewEncoder(w).Encode(challenge)
} }
func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized map[string]ssh.PublicKey) { func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized map[string]ssh.PublicKey) {
log.Printf("complete: new completion from %s\n", r.RemoteAddr)
var response internal.AuthResponse var response internal.AuthResponse
if err := msgpack.NewDecoder(r.Body).Decode(&response); err != nil { if err := msgpack.NewDecoder(r.Body).Decode(&response); err != nil {
@ -174,7 +178,7 @@ func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized ma
Expires: time.Now().Add(5 * time.Minute), Expires: time.Now().Add(5 * time.Minute),
}) })
log.Println("auth completed") log.Printf("complete: completed auth for %s\n", r.RemoteAddr)
w.Header().Set("Content-Type", "application/msgpack") w.Header().Set("Content-Type", "application/msgpack")
msgpack.NewEncoder(w).Encode(internal.AuthResult{ msgpack.NewEncoder(w).Encode(internal.AuthResult{
@ -183,6 +187,8 @@ func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized ma
} }
func HandleReceiveRequest(w http.ResponseWriter, r *http.Request) { func HandleReceiveRequest(w http.ResponseWriter, r *http.Request) {
log.Printf("receive: request from %s\n", r.RemoteAddr)
token := r.Header.Get("Authorization") token := r.Header.Get("Authorization")
if token == "" { if token == "" {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
@ -257,7 +263,8 @@ func HandleReceiveRequest(w http.ResponseWriter, r *http.Request) {
defer target.Close() defer target.Close()
if _, err := io.Copy(target, part); err != nil { read, err := io.Copy(target, part)
if err != nil {
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
log.Warning("receive: failed to copy sent file") log.Warning("receive: failed to copy sent file")
@ -265,6 +272,8 @@ func HandleReceiveRequest(w http.ResponseWriter, r *http.Request) {
return return
} }
log.Printf("receive: stored %s from %s (%d bytes)\n", name, r.RemoteAddr, read)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }