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

improve logging

Browse Source
This commit is contained in:
Laura
2025-06-20 18:11:26 +02:00
parent e70f7f36f9
commit 1f1fb4c6e3
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/main.go
View File

@ -38,8 +38,6 @@ func main() {
r.Post("/receive", HandleReceiveRequest)
log.Println("Listening on :7966")
srv := &http.Server{
Addr: ":7966",
Handler: r,
@ -48,5 +46,6 @@ func main() {
},
}
log.Println("Server listening on :7966")
srv.ListenAndServeTLS("cert.pem", "key.pem")
}

20
server/protocol.go
View File

@ -32,14 +32,14 @@ func IsSignatureFormatValid(format string) bool {
}
func HandleChallengeRequest(w http.ResponseWriter, r *http.Request, authorized map[string]ssh.PublicKey) {
log.Printf("request: new request from %s\n", r.RemoteAddr)
log.Printf("request: received new request from %s\n", r.RemoteAddr)
var request internal.AuthRequest
if err := msgpack.NewDecoder(r.Body).Decode(&request); err != nil {
w.WriteHeader(http.StatusBadRequest)
log.Warning("request: failed to decode request")
log.Warning("request: failed to decode request payload")
log.WarningE(err)
return
@ -49,7 +49,7 @@ func HandleChallengeRequest(w http.ResponseWriter, r *http.Request, authorized m
if err != nil {
w.WriteHeader(http.StatusBadRequest)
log.Warning("request: failed to parse/authorize public key")
log.Warning("request: failed to parse or authorize public key")
log.WarningE(err)
return
@ -77,14 +77,14 @@ func HandleChallengeRequest(w http.ResponseWriter, r *http.Request, authorized m
}
func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized map[string]ssh.PublicKey) {
log.Printf("complete: new completion from %s\n", r.RemoteAddr)
log.Printf("complete: received completion from %s\n", r.RemoteAddr)
var response internal.AuthResponse
if err := msgpack.NewDecoder(r.Body).Decode(&response); err != nil {
w.WriteHeader(http.StatusBadRequest)
log.Warning("complete: failed to decode response")
log.Warning("complete: failed to decode response payload")
log.WarningE(err)
return
@ -94,7 +94,7 @@ func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized ma
if err != nil {
w.WriteHeader(http.StatusBadRequest)
log.Warning("complete: failed to parse/authorize public key")
log.Warning("complete: failed to parse or authorize public key")
log.WarningE(err)
return
@ -170,7 +170,7 @@ func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized ma
PublicKey: public,
}, cache.DefaultExpiration)
log.Printf("complete: completed auth for %s\n", r.RemoteAddr)
log.Printf("complete: authentication completed for %s\n", r.RemoteAddr)
w.Header().Set("Content-Type", "application/msgpack")
msgpack.NewEncoder(w).Encode(internal.AuthResult{
@ -179,7 +179,7 @@ func HandleCompleteRequest(w http.ResponseWriter, r *http.Request, authorized ma
}
func HandleReceiveRequest(w http.ResponseWriter, r *http.Request) {
log.Printf("receive: request from %s\n", r.RemoteAddr)
log.Printf("receive: received request from %s\n", r.RemoteAddr)
token := r.Header.Get("Authorization")
if token == "" {
@ -250,12 +250,12 @@ func HandleReceiveRequest(w http.ResponseWriter, r *http.Request) {
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
log.Warning("receive: failed to copy sent file")
log.Warning("receive: failed to save uploaded file")
return
}
log.Printf("receive: stored %s from %s (%d bytes)\n", name, r.RemoteAddr, read)
log.Printf("receive: stored file %s from %s (%d bytes)\n", name, r.RemoteAddr, read)
w.WriteHeader(http.StatusOK)
}