feat: add Creator username password login
CI / test (push) Failing after 15m55s

This commit is contained in:
m
2026-08-16 16:56:38 +03:00
parent 111ad75dea
commit 5fca81531a
15 changed files with 279 additions and 34 deletions
+35 -16
View File
@@ -12,6 +12,7 @@ import (
identitydomain "git.cin.su/m/Assistant/modules/identity/domain"
situationdomain "git.cin.su/m/Assistant/modules/situation/domain"
"git.cin.su/m/Assistant/runtime/health"
"io"
"log"
"net/http"
"os"
@@ -19,12 +20,15 @@ import (
"time"
)
const maxCreatorCredentialsBytes = 4 << 10
func main() {
addr := os.Getenv("LISTEN_ADDR")
if addr == "" {
addr = ":8080"
}
bootstrapToken, sessionKey := os.Getenv("CREATOR_BOOTSTRAP_TOKEN"), []byte(os.Getenv("CREATOR_SESSION_SIGNING_KEY"))
creatorUsername, creatorPassword := os.Getenv("CREATOR_USERNAME"), os.Getenv("CREATOR_PASSWORD")
repository, err := postgres.OpenSituation(context.Background(), postgres.ContinuityConfig{Host: os.Getenv("POSTGRES_HOST"), Port: os.Getenv("POSTGRES_PORT"), Database: os.Getenv("POSTGRES_DATABASE"), User: os.Getenv("POSTGRES_USER"), Password: os.Getenv("POSTGRES_PASSWORD")})
if err != nil {
log.Fatal(err)
@@ -63,22 +67,7 @@ func main() {
return situationdomain.NewResolver(bindings).Resolve(runtime)
}
mux.Handle("/healthz", health.Handler{Runtime: "core-runtime", SemanticGeneration: 1, ArchitectureGeneration: 1})
mux.HandleFunc("POST /v1/creator/sessions", func(w http.ResponseWriter, r *http.Request) {
if !identitydomain.BootstrapMatches(bootstrapToken, bearerToken(r)) {
http.Error(w, "creator authentication denied", http.StatusUnauthorized)
return
}
token, session, err := identitydomain.IssueCreatorSession(sessionKey, time.Now(), 8*time.Hour)
if err != nil {
http.Error(w, "creator session unavailable", http.StatusServiceUnavailable)
return
}
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(struct {
Token string
Session identity.CreatorSession
}{token, session})
})
mux.HandleFunc("POST /v1/creator/sessions", creatorSessionHandler(bootstrapToken, creatorUsername, creatorPassword, sessionKey, time.Now))
mux.HandleFunc("GET /v1/creator/sessions/current", func(w http.ResponseWriter, r *http.Request) {
session, ok := authenticateCreator(w, r)
if !ok {
@@ -273,6 +262,36 @@ func main() {
}
}
func creatorSessionHandler(bootstrapToken, creatorUsername, creatorPassword string, sessionKey []byte, now func() time.Time) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
authenticated := identitydomain.BootstrapMatches(bootstrapToken, bearerToken(r))
if !authenticated {
var credentials identity.CreatorCredentials
decoder := json.NewDecoder(io.LimitReader(r.Body, maxCreatorCredentialsBytes+1))
decoder.DisallowUnknownFields()
if err := decoder.Decode(&credentials); err != nil || decoder.Decode(&struct{}{}) != io.EOF {
http.Error(w, "creator authentication denied", http.StatusUnauthorized)
return
}
authenticated = identitydomain.CreatorCredentialsMatch(creatorUsername, creatorPassword, credentials)
}
if !authenticated {
http.Error(w, "creator authentication denied", http.StatusUnauthorized)
return
}
token, session, err := identitydomain.IssueCreatorSession(sessionKey, now(), 8*time.Hour)
if err != nil {
http.Error(w, "creator session unavailable", http.StatusServiceUnavailable)
return
}
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(struct {
Token string
Session identity.CreatorSession
}{token, session})
}
}
func bearerToken(r *http.Request) string {
value := r.Header.Get("Authorization")
if !strings.HasPrefix(value, "Bearer ") {
+51
View File
@@ -1,8 +1,12 @@
package main
import (
"encoding/json"
"net/http"
"net/http/httptest"
"strings"
"testing"
"time"
)
func TestBearerTokenRequiresBearerScheme(t *testing.T) {
@@ -16,3 +20,50 @@ func TestBearerTokenRequiresBearerScheme(t *testing.T) {
t.Fatalf("token = %q", token)
}
}
func TestCreatorSessionHandlerAcceptsConfiguredCredentials(t *testing.T) {
handler := creatorSessionHandler("recovery", "m", "password", []byte("01234567890123456789012345678901"), func() time.Time { return time.Unix(1000, 0) })
request := httptest.NewRequest(http.MethodPost, "/v1/creator/sessions", strings.NewReader(`{"username":"m","password":"password"}`))
response := httptest.NewRecorder()
handler(response, request)
if response.Code != http.StatusOK {
t.Fatalf("status = %d body=%s", response.Code, response.Body.String())
}
var issued struct {
Token string
}
if err := json.NewDecoder(response.Body).Decode(&issued); err != nil || issued.Token == "" {
t.Fatalf("session response = %+v, err=%v", issued, err)
}
}
func TestCreatorSessionHandlerFailsClosed(t *testing.T) {
handler := creatorSessionHandler("recovery", "m", "password", []byte("01234567890123456789012345678901"), time.Now)
tests := []string{
`{"username":"wrong","password":"password"}`,
`{"username":"m","password":"wrong"}`,
`{"username":"","password":""}`,
`{"username":"m","password":"password","actor":"attacker"}`,
`{`,
`{"username":"m","password":"password"}{}`,
}
for _, body := range tests {
request := httptest.NewRequest(http.MethodPost, "/v1/creator/sessions", strings.NewReader(body))
response := httptest.NewRecorder()
handler(response, request)
if response.Code != http.StatusUnauthorized || strings.TrimSpace(response.Body.String()) != "creator authentication denied" {
t.Fatalf("body %q: status=%d response=%q", body, response.Code, response.Body.String())
}
}
}
func TestCreatorSessionHandlerPreservesBootstrapRecovery(t *testing.T) {
handler := creatorSessionHandler("recovery", "", "", []byte("01234567890123456789012345678901"), time.Now)
request := httptest.NewRequest(http.MethodPost, "/v1/creator/sessions", nil)
request.Header.Set("Authorization", "Bearer recovery")
response := httptest.NewRecorder()
handler(response, request)
if response.Code != http.StatusOK {
t.Fatalf("bootstrap recovery status = %d", response.Code)
}
}