Compare commits

...
Author SHA1 Message Date
patrickandClaude Sonnet 5.5 5f984e87a7 ai/provider: Opt-in-Test und Pruefprotokoll ENG-09
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Canceled after 0s
CI / Core-Modul (Build/Vet/Test) (push) Successful in 47s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 3s
CI / Web (dms-browser) (push) Failing after 52s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 15s
CI / Web (pdf-viewer) (push) Failing after 44s
CI / Web (shl) (push) Failing after 8s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 17s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (pull_request) Canceled after 0s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 3s
AI-Pflichttest-Gate / pflichttest-gate (pull_request) Successful in 5m59s
CI / Core-Modul (Build/Vet/Test) (pull_request) Successful in 49s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (pull_request) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (pull_request) Successful in 2s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (pull_request) Failing after 16s
CI / Web (dms-browser) (pull_request) Failing after 56s
CI / Web (pdf-viewer) (pull_request) Failing after 42s
CI / Web (shl) (pull_request) Failing after 8s
Core-Schnittstellen-Vertragstests / contract-tests (pull_request) Successful in 5m28s
Supply-Chain-Scan (Go) / govulncheck (pull_request) Failing after 1m50s
Supply-Chain-Scan (npm) / npm-audit (pull_request) Failing after 1m21s
Core-Pflichttest-Gate / pflichttest-gate (pull_request) Successful in 1m43s
RBAC-Rollenhierarchie-Pflichtgate / rbac-policy-invariant (pull_request) Successful in 5m24s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (pull_request) Failing after 3s
DB-Integrationstests / db-tests (pull_request) Canceled after 0s
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-06 22:59:04 +01:00
patrickandClaude Sonnet 5.5 523042509d ai/provider: Gemini-Adapter hinter dem Provider-Interface
CI / Core-Modul (Build/Vet/Test) (push) Successful in 44s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 3s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 15s
CI / Web (dms-browser) (push) Failing after 1m1s
CI / Web (pdf-viewer) (push) Failing after 41s
CI / Web (shl) (push) Failing after 7s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Failing after 28s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 19s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 3s
Chat, Completion und Embedding ueber die Gemini-REST-API, Schluessel nur
per NEXARCH_AI_GEMINI_API_KEY (Header, nie URL). Ohne Schluessel
deaktiviert. Vertragstest gegen Fake-Server.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-06 22:48:45 +01:00
patrick 998aaf964c Merge pull request 'connect: DATEV-Export in connect-app registrieren' (#429) from feat/connect-datev-registrieren into main
CI / Web (pdf-viewer) (push) Failing after 40s
CI / Web (shl) (push) Failing after 8s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 43s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Failing after 29s
CI / Core-Modul (Build/Vet/Test) (push) Successful in 38s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 3s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 14s
CI / Web (dms-browser) (push) Failing after 54s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 2s
2026-10-30 00:24:20 +01:00
patrickandClaude Sonnet 5.5 976878136f Merge main in feat/connect-datev-registrieren
CI / Web (shl) (pull_request) Failing after 8s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 46s
RBAC-Rollenhierarchie-Pflichtgate / rbac-policy-invariant (pull_request) Successful in 19m25s
Core-Schnittstellen-Vertragstests / contract-tests (pull_request) Successful in 18m53s
Supply-Chain-Scan (Go) / govulncheck (pull_request) Failing after 44s
Supply-Chain-Scan (npm) / npm-audit (pull_request) Failing after 1m20s
Core-Pflichttest-Gate / pflichttest-gate (pull_request) Successful in 19m26s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 2s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (pull_request) Failing after 2s
DB-Integrationstests / db-tests (pull_request) Canceled after 0s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 3s
CI / Core-Modul (Build/Vet/Test) (push) Successful in 44s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 4s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 14s
CI / Web (dms-browser) (push) Failing after 1m1s
CI / Web (pdf-viewer) (push) Failing after 37s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Canceled after 0s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (pull_request) Canceled after 0s
CI / Web (shl) (push) Failing after 9s
CI / Core-Modul (Build/Vet/Test) (pull_request) Successful in 44s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (pull_request) Successful in 2s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (pull_request) Successful in 3s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (pull_request) Failing after 14s
CI / Web (dms-browser) (pull_request) Failing after 55s
CI / Web (pdf-viewer) (pull_request) Failing after 41s
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-30 00:24:14 +01:00
patrick dc8f6476ab Merge pull request 'connect/statusapi: Rolle aus dem Token an die Policy' (#428) from fix/statusapi-rolle into main
CI / Core-Modul (Build/Vet/Test) (push) Successful in 49s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 4s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 2s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 4s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 14s
CI / Web (dms-browser) (push) Failing after 1m1s
CI / Web (pdf-viewer) (push) Failing after 50s
CI / Web (shl) (push) Failing after 9s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 50s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Canceled after 0s
2026-10-30 00:23:50 +01:00
patrickandClaude Sonnet 5.5 753af35888 connect: DATEV-Export in connect-app registriert, mit Rechtepruefung
Supply-Chain-Scan (Go) / govulncheck (pull_request) Failing after 42s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 2s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (pull_request) Failing after 2s
DB-Integrationstests / db-tests (pull_request) Canceled after 0s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Canceled after 0s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (pull_request) Canceled after 0s
CI / Web (pdf-viewer) (push) Failing after 36s
CI / Web (shl) (push) Failing after 7s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 43s
CI / Core-Modul (Build/Vet/Test) (pull_request) Successful in 46s
CI / Web (dms-browser) (pull_request) Failing after 58s
CI / Web (pdf-viewer) (pull_request) Failing after 43s
Core-Schnittstellen-Vertragstests / contract-tests (pull_request) Successful in 18m38s
CI / Core-Modul (Build/Vet/Test) (push) Successful in 39s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 3s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 15s
CI / Web (dms-browser) (push) Failing after 51s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (pull_request) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (pull_request) Successful in 4s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (pull_request) Failing after 14s
CI / Web (shl) (pull_request) Failing after 9s
Supply-Chain-Scan (npm) / npm-audit (pull_request) Failing after 1m16s
Core-Pflichttest-Gate / pflichttest-gate (pull_request) Successful in 18m46s
RBAC-Rollenhierarchie-Pflichtgate / rbac-policy-invariant (pull_request) Successful in 18m59s
/datev/exports braucht connect.datev.write (POST) bzw. connect.datev.read
(GET) mit der Rolle aus X-User-Role. Registriert nur mit
NEXARCH_CONNECT_APP_ARCHIVE_URL; die DATEV-Uebertragung bleibt aus.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-30 00:23:17 +01:00
patrickandClaude Sonnet 5.5 422e96cc20 connect/statusapi: Rolle aus X-User-Role an die Policy
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (push) Failing after 5s
CI / DMS-Modul (Lint/Build/Test/Coverage/Artefakt) (pull_request) Failing after 3s
DB-Integrationstests / db-tests (pull_request) Canceled after 0s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (push) Canceled after 0s
CI / Core-Modul (Build/Vet/Test) (push) Successful in 40s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (push) Successful in 3s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (push) Successful in 3s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (push) Failing after 14s
Supply-Chain-Scan (Go) / govulncheck (push) Failing after 41s
CI / Core-Modul (Build/Vet/Test) (pull_request) Successful in 42s
CI / DMS Security-Test-Gate (AC5, Merge-Gate) (pull_request) Successful in 2s
CI / Connect Security-Test-Gate (QA-01 AC4, Merge-Gate) (pull_request) Successful in 2s
CI / Web (dms-browser) (push) Failing after 57s
CI / Web (pdf-viewer) (push) Failing after 40s
CI / Web (shl) (push) Failing after 8s
CI / Web (shl) (pull_request) Failing after 9s
Core-Schnittstellen-Vertragstests / contract-tests (pull_request) Successful in 18m52s
CI / DMS-Modul Supply-Chain-Scan (govulncheck) (pull_request) Failing after 14s
CI / Web (dms-browser) (pull_request) Failing after 50s
CI / Web (pdf-viewer) (pull_request) Failing after 38s
Supply-Chain-Scan (Go) / govulncheck (pull_request) Failing after 36s
Supply-Chain-Scan (npm) / npm-audit (pull_request) Failing after 1m17s
Core-Pflichttest-Gate / pflichttest-gate (pull_request) Successful in 18m56s
CI / Web-Barrierefreiheitspruefung (axe, Tastatur, Reflow, Textabstaende) (pull_request) Failing after 29s
RBAC-Rollenhierarchie-Pflichtgate / rbac-policy-invariant (pull_request) Successful in 18m24s
Bisher fragte statusapi mit fester Rolle user. bearerauth setzt X-User-Role
aus dem Token; ohne Header bleibt es bei user.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-29 23:42:16 +01:00
9 changed files with 546 additions and 5 deletions

No files matched your search

+32
View File
@@ -0,0 +1,32 @@
# ENG-09 – Weitere Provider (OpenAI-kompatible Presets, Gemini) – Prüfprotokoll
Datum: 2026-11-06. Host: Entwicklungshost 192.168.1.204.
## Umsetzung
- Neues Paket `ai/internal/provider/gemini`: Chat, Completion (über Chat) und Embedding gegen die Gemini-REST-API (`generateContent`, `embedContent`). Schlüssel aus `NEXARCH_AI_GEMINI_API_KEY`, optionale Basis-URL `NEXARCH_AI_GEMINI_BASE_URL`; Schlüssel nur im Header `x-goog-api-key`. Ohne Schlüssel liefert `NewFromEnv` `ErrDisabled`.
- OpenAI-kompatible Dienste: der vorhandene `openai`-Adapter nimmt bereits eine Basis-URL (`NEXARCH_AI_OPENAI_BASE_URL`); es war keine Codeänderung nötig.
- Opt-in je Mandant: `openai.GuardedProvider` mit `TenantGate` umschließt jeden `provider.Provider`, auch den Gemini-Adapter.
## Akzeptanzkriterien
| # | Kriterium | Ergebnis |
|---|---|---|
| 1 | OpenAI-kompatible Dienste ohne Codeänderung über Basis-URL und Schlüssel aus Umgebungsvariablen | **Teilweise belegt.** Mechanismus vorhanden und durch bestehende `openai`-Tests (Fake-Server mit abweichender Basis-URL) abgedeckt. Gegen OpenRouter, vLLM, LiteLLM oder DeepSeek nicht getestet (keine Zugänge). |
| 2 | Gemini-Adapter erfüllt den Provider-Vertragstest | **Erfüllt gegen Fake-Server.** `TestContract_Gemini` (Chat, Complete, Embed über `runContract`), `TestUniformErrors` (404, 429, 500 auf die einheitlichen Codes), Timeout/Nicht-Erreichbar (`TestUnreachableAndCancelled`). Nicht gegen die echte Gemini-API. |
| 3 | Externe Anbieter nur nach Opt-in und Residenz-Prüfung | **Teilweise belegt.** Opt-in per `GuardedProvider` belegt (`TestOptIn_GuardedProviderBlocksWithoutCallingServer`: kein Aufruf ohne Freigabe oder ohne Mandant). Datenresidenz-Prüfung (`residency`) ist nicht an den Adapter gekoppelt. |
| 4 | Zugangsdaten ausschließlich über Umgebungsvariablen | **Erfüllt.** `TestDisabledWithoutKey`; `TestKeyNotInErrors`; Schlüssel nie in der URL (`fakeServer` prüft den Query-Parameter `key`). |
## Prüfungen vor der Abnahme
| # | Prüfung | Ergebnis |
|---|---|---|
| 1 | Vertragstest gegen jeden neuen Adapter | **Bestanden** (Fake-Server). Echte Gemini-API: **offen**, kein API-Schlüssel vorhanden. |
| 2 | Opt-in-Verweigerung blockiert den Aufruf nachweislich | **Bestanden.** Server-Zähler bleibt unberührt. |
| 3 | Keine echten Kundendaten in Tests gegen externe Dienste | **Bestanden.** Es gibt keine Tests gegen externe Dienste. |
## Einschränkungen
- Kein Lauf gegen eine echte Gemini-API; Request-/Response-Format nach der öffentlichen REST-Dokumentation nachgebaut, nicht gegen den echten Dienst verifiziert.
- `ai-app` bindet den Adapter nicht ein; die Fehlermeldung von `GuardedProvider` nennt den Anbieter `openai`, auch wenn Gemini umschlossen ist.
- Kopplung an `residency` und Streaming sind nicht Teil dieser Kachel.
+21
View File
@@ -2,12 +2,17 @@ package provider_test
import (
"context"
"encoding/json"
"errors"
"net/http"
"net/http/httptest"
"os"
"strings"
"testing"
"time"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider/gemini"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider/mock"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider/ollama"
)
@@ -84,6 +89,22 @@ func TestContract_Ollama(t *testing.T) {
runContract(t, p, model)
}
func TestContract_Gemini(t *testing.T) {
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(r.URL.Path, ":embedContent") {
_ = json.NewEncoder(w).Encode(map[string]any{"embedding": map[string]any{"values": []float64{0.1, 0.2}}})
return
}
_ = json.NewEncoder(w).Encode(map[string]any{"candidates": []map[string]any{{"content": map[string]any{"parts": []map[string]string{{"text": "OK"}}}}}})
}))
defer srv.Close()
p, err := gemini.New(srv.URL, "k")
if err != nil {
t.Fatal(err)
}
runContract(t, p, "gemini-test")
}
// TestInterchangeable_SameCallerCode belegt AK2: ein Aufrufer, der gegen das
// Interface programmiert, funktioniert unveraendert mit jeder Implementierung.
func TestInterchangeable_SameCallerCode(t *testing.T) {
+203
View File
@@ -0,0 +1,203 @@
package gemini
import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
"os"
"strings"
"time"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider"
)
const (
DefaultBaseURL = "https://generativelanguage.googleapis.com/v1beta"
EnvAPIKey = "NEXARCH_AI_GEMINI_API_KEY"
EnvBaseURL = "NEXARCH_AI_GEMINI_BASE_URL"
)
var ErrDisabled = fmt.Errorf("gemini-adapter: %s nicht gesetzt, adapter bleibt deaktiviert", EnvAPIKey)
type Provider struct {
BaseURL string
APIKey string
Client *http.Client
}
var _ provider.Provider = (*Provider)(nil)
func New(baseURL, apiKey string) (*Provider, error) {
if apiKey == "" {
return nil, ErrDisabled
}
if baseURL == "" {
baseURL = DefaultBaseURL
}
return &Provider{
BaseURL: strings.TrimRight(baseURL, "/"),
APIKey: apiKey,
Client: &http.Client{Timeout: 120 * time.Second},
}, nil
}
func NewFromEnv() (*Provider, error) {
return New(os.Getenv(EnvBaseURL), os.Getenv(EnvAPIKey))
}
func newErr(code provider.Code, msg string, err error) error {
return &provider.Error{Provider: "gemini", Code: code, Message: msg, Err: err}
}
func (p *Provider) do(ctx context.Context, model, method string, body, out any) error {
buf, err := json.Marshal(body)
if err != nil {
return newErr(provider.CodeInvalidRequest, "anfrage kodieren", err)
}
endpoint := fmt.Sprintf("%s/models/%s:%s", p.BaseURL, url.PathEscape(strings.TrimPrefix(model, "models/")), method)
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(buf))
if err != nil {
return newErr(provider.CodeInvalidRequest, "anfrage aufbauen", err)
}
req.Header.Set("x-goog-api-key", p.APIKey)
req.Header.Set("Content-Type", "application/json")
resp, err := p.Client.Do(req)
if err != nil {
if ctx.Err() != nil {
return newErr(provider.CodeTimeout, "anfrage abgebrochen", err)
}
return newErr(provider.CodeUnavailable, "dienst nicht erreichbar", err)
}
defer resp.Body.Close()
data, err := io.ReadAll(resp.Body)
if err != nil {
return newErr(provider.CodeUpstream, "antwort lesen", err)
}
switch {
case resp.StatusCode == http.StatusNotFound:
return newErr(provider.CodeModelNotFound, "modell nicht gefunden", fmt.Errorf("http %d", resp.StatusCode))
case resp.StatusCode == http.StatusTooManyRequests:
return newErr(provider.CodeRateLimited, "rate limit", fmt.Errorf("http %d", resp.StatusCode))
case resp.StatusCode >= 400:
return newErr(provider.CodeUpstream, "fehlerhafte antwort", fmt.Errorf("http %d: %s", resp.StatusCode, string(data)))
}
if err := json.Unmarshal(data, out); err != nil {
return newErr(provider.CodeUpstream, "antwort dekodieren", err)
}
return nil
}
type part struct {
Text string `json:"text"`
}
type content struct {
Role string `json:"role,omitempty"`
Parts []part `json:"parts"`
}
type generationConfig struct {
MaxOutputTokens int `json:"maxOutputTokens,omitempty"`
Temperature float64 `json:"temperature"`
}
type generateRequest struct {
SystemInstruction *content `json:"systemInstruction,omitempty"`
Contents []content `json:"contents"`
GenerationConfig generationConfig `json:"generationConfig"`
}
type generateResponse struct {
Candidates []struct {
Content content `json:"content"`
FinishReason string `json:"finishReason"`
} `json:"candidates"`
UsageMetadata struct {
PromptTokenCount int `json:"promptTokenCount"`
CandidatesTokenCount int `json:"candidatesTokenCount"`
TotalTokenCount int `json:"totalTokenCount"`
} `json:"usageMetadata"`
ModelVersion string `json:"modelVersion"`
}
func (p *Provider) Chat(ctx context.Context, req provider.ChatRequest) (provider.ChatResponse, error) {
body := generateRequest{GenerationConfig: generationConfig{MaxOutputTokens: req.MaxTokens, Temperature: req.Temperature}}
var system []part
for _, m := range req.Messages {
switch m.Role {
case provider.RoleSystem:
system = append(system, part{Text: m.Content})
case provider.RoleAssistant:
body.Contents = append(body.Contents, content{Role: "model", Parts: []part{{Text: m.Content}}})
default:
body.Contents = append(body.Contents, content{Role: "user", Parts: []part{{Text: m.Content}}})
}
}
if len(system) > 0 {
body.SystemInstruction = &content{Parts: system}
}
var out generateResponse
if err := p.do(ctx, req.Model, "generateContent", body, &out); err != nil {
return provider.ChatResponse{}, err
}
if len(out.Candidates) == 0 {
return provider.ChatResponse{}, newErr(provider.CodeUpstream, "keine antwort in candidates", nil)
}
c := out.Candidates[0]
var text strings.Builder
for _, pt := range c.Content.Parts {
text.WriteString(pt.Text)
}
return provider.ChatResponse{
Model: out.ModelVersion,
Message: provider.Message{Role: provider.RoleAssistant, Content: text.String()},
FinishReason: c.FinishReason,
Usage: provider.Usage{
PromptTokens: out.UsageMetadata.PromptTokenCount,
CompletionTokens: out.UsageMetadata.CandidatesTokenCount,
TotalTokens: out.UsageMetadata.TotalTokenCount,
},
}, nil
}
func (p *Provider) Complete(ctx context.Context, req provider.CompletionRequest) (provider.CompletionResponse, error) {
resp, err := p.Chat(ctx, provider.ChatRequest{
Model: req.Model,
Messages: []provider.Message{{Role: provider.RoleUser, Content: req.Prompt}},
MaxTokens: req.MaxTokens,
Temperature: req.Temperature,
})
if err != nil {
return provider.CompletionResponse{}, err
}
return provider.CompletionResponse{Model: resp.Model, Text: resp.Message.Content, FinishReason: resp.FinishReason, Usage: resp.Usage}, nil
}
type embedRequest struct {
Content content `json:"content"`
}
type embedResponse struct {
Embedding struct {
Values []float64 `json:"values"`
} `json:"embedding"`
}
func (p *Provider) Embed(ctx context.Context, req provider.EmbeddingRequest) (provider.EmbeddingResponse, error) {
var out embedResponse
body := embedRequest{Content: content{Parts: []part{{Text: req.Input}}}}
if err := p.do(ctx, req.Model, "embedContent", body, &out); err != nil {
return provider.EmbeddingResponse{}, err
}
if len(out.Embedding.Values) == 0 {
return provider.EmbeddingResponse{}, newErr(provider.CodeUpstream, "keine einbettung in der antwort", nil)
}
return provider.EmbeddingResponse{Model: req.Model, Embedding: out.Embedding.Values}, nil
}
+148
View File
@@ -0,0 +1,148 @@
package gemini
import (
"context"
"encoding/json"
"net/http"
"net/http/httptest"
"strings"
"testing"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider"
"gitea.perlbach24.de/scripte/nexarch/ai/internal/provider/openai"
)
func fakeServer(t *testing.T, status int) (*httptest.Server, *map[string]any) {
t.Helper()
var last map[string]any
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if got := r.Header.Get("x-goog-api-key"); got != "key-1" {
t.Errorf("x-goog-api-key = %q", got)
}
if r.URL.Query().Get("key") != "" {
t.Error("schluessel darf nicht in der url stehen")
}
_ = json.NewDecoder(r.Body).Decode(&last)
if status != http.StatusOK {
w.WriteHeader(status)
_, _ = w.Write([]byte(`{"error":{"message":"x"}}`))
return
}
switch {
case strings.HasSuffix(r.URL.Path, ":generateContent"):
_ = json.NewEncoder(w).Encode(map[string]any{
"candidates": []map[string]any{{
"content": map[string]any{"role": "model", "parts": []map[string]string{{"text": "ha"}, {"text": "llo"}}},
"finishReason": "STOP",
}},
"usageMetadata": map[string]int{"promptTokenCount": 3, "candidatesTokenCount": 2, "totalTokenCount": 5},
"modelVersion": "gemini-test",
})
case strings.HasSuffix(r.URL.Path, ":embedContent"):
_ = json.NewEncoder(w).Encode(map[string]any{"embedding": map[string]any{"values": []float64{0.1, 0.2}}})
default:
t.Errorf("unerwarteter pfad %s", r.URL.Path)
}
}))
t.Cleanup(srv.Close)
return srv, &last
}
func TestChat_MapsRolesUsageAndParts(t *testing.T) {
srv, last := fakeServer(t, http.StatusOK)
p, _ := New(srv.URL, "key-1")
resp, err := p.Chat(context.Background(), provider.ChatRequest{
Model: "models/gemini-test",
Messages: []provider.Message{
{Role: provider.RoleSystem, Content: "sys"},
{Role: provider.RoleUser, Content: "u"},
{Role: provider.RoleAssistant, Content: "a"},
},
})
if err != nil {
t.Fatal(err)
}
if resp.Message.Content != "hallo" || resp.Usage.TotalTokens != 5 || resp.FinishReason != "STOP" {
t.Fatalf("unerwartet: %+v", resp)
}
if (*last)["systemInstruction"] == nil {
t.Fatal("systemInstruction fehlt")
}
contents := (*last)["contents"].([]any)
if len(contents) != 2 || contents[1].(map[string]any)["role"] != "model" {
t.Fatalf("rollen falsch: %v", contents)
}
}
func TestCompleteAndEmbed(t *testing.T) {
srv, _ := fakeServer(t, http.StatusOK)
p, _ := New(srv.URL, "key-1")
c, err := p.Complete(context.Background(), provider.CompletionRequest{Model: "m", Prompt: "x"})
if err != nil || c.Text != "hallo" {
t.Fatalf("complete: %+v %v", c, err)
}
e, err := p.Embed(context.Background(), provider.EmbeddingRequest{Model: "m", Input: "x"})
if err != nil || len(e.Embedding) != 2 {
t.Fatalf("embed: %+v %v", e, err)
}
}
func TestUniformErrors(t *testing.T) {
for status, code := range map[int]provider.Code{404: provider.CodeModelNotFound, 429: provider.CodeRateLimited, 500: provider.CodeUpstream} {
srv, _ := fakeServer(t, status)
p, _ := New(srv.URL, "key-1")
_, err := p.Chat(context.Background(), provider.ChatRequest{Model: "m", Messages: []provider.Message{{Role: provider.RoleUser, Content: "x"}}})
if !provider.IsCode(err, code) {
t.Errorf("status %d: err=%v, want %s", status, err, code)
}
}
}
func TestUnreachableAndCancelled(t *testing.T) {
p, _ := New("http://127.0.0.1:1", "key-1")
_, err := p.Embed(context.Background(), provider.EmbeddingRequest{Model: "m", Input: "x"})
if !provider.IsCode(err, provider.CodeUnavailable) {
t.Fatalf("err=%v", err)
}
ctx, cancel := context.WithCancel(context.Background())
cancel()
_, err = p.Embed(ctx, provider.EmbeddingRequest{Model: "m", Input: "x"})
if !provider.IsCode(err, provider.CodeTimeout) {
t.Fatalf("err=%v", err)
}
}
func TestDisabledWithoutKey(t *testing.T) {
t.Setenv(EnvAPIKey, "")
if _, err := NewFromEnv(); err != ErrDisabled {
t.Fatalf("err=%v", err)
}
}
func TestKeyNotInErrors(t *testing.T) {
srv, _ := fakeServer(t, http.StatusInternalServerError)
p, _ := New(srv.URL, "key-1")
_, err := p.Chat(context.Background(), provider.ChatRequest{Model: "m", Messages: []provider.Message{{Role: provider.RoleUser, Content: "x"}}})
if err == nil || strings.Contains(err.Error(), "key-1") {
t.Fatalf("err=%v", err)
}
}
func TestOptIn_GuardedProviderBlocksWithoutCallingServer(t *testing.T) {
called := false
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) { called = true }))
defer srv.Close()
inner, _ := New(srv.URL, "key-1")
g := &openai.GuardedProvider{Inner: inner, Gate: openai.NewEnvTenantGate("acme")}
req := provider.ChatRequest{Model: "m", Messages: []provider.Message{{Role: provider.RoleUser, Content: "x"}}}
if _, err := g.Chat(openai.WithTenant(context.Background(), "other"), req); err == nil {
t.Fatal("freigabe fehlt, fehler erwartet")
}
if _, err := g.Chat(context.Background(), req); err == nil {
t.Fatal("ohne mandant, fehler erwartet")
}
if called {
t.Fatal("server wurde trotz fehlender freigabe aufgerufen")
}
}
+25
View File
@@ -18,9 +18,12 @@ import (
"gitea.perlbach24.de/scripte/nexarch/common/bearerauth"
"gitea.perlbach24.de/scripte/nexarch/common/moduleauth"
"gitea.perlbach24.de/scripte/nexarch/common/policyclient"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/archiveclient"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/connectorsetupapi"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/credential"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/datevapi"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/datevexport"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/dms2import"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/dms2importapi"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/fieldmapping"
@@ -56,6 +59,25 @@ func buildPolicyClient() *policyclient.Client {
return policyclient.New(policyURL, token)
}
// buildDatevExports liefert nil ohne NEXARCH_CONNECT_APP_ARCHIVE_URL; dann ist
// /datev/exports nicht registriert. Die DATEV-Uebertragung ist hier nicht verdrahtet.
func buildDatevExports(pool *pgxpool.Pool) *datevexport.Store {
archiveURL := os.Getenv("NEXARCH_CONNECT_APP_ARCHIVE_URL")
if archiveURL == "" {
log.Print("connect-app: NEXARCH_CONNECT_APP_ARCHIVE_URL fehlt, /datev/exports nicht registriert")
return nil
}
token := os.Getenv("NEXARCH_CONNECT_APP_ARCHIVE_SERVICE_TOKEN")
if token == "" {
log.Fatal("connect-app: NEXARCH_CONNECT_APP_ARCHIVE_SERVICE_TOKEN ist erforderlich, wenn NEXARCH_CONNECT_APP_ARCHIVE_URL gesetzt ist")
}
return &datevexport.Store{
Pool: pool,
Archive: archiveclient.New(archiveURL, token),
CallbackURL: os.Getenv("NEXARCH_CONNECT_APP_DATEV_CALLBACK_URL"),
}
}
func main() {
if !killswitch.Enabled() {
log.Printf("connect-app: deaktiviert (%s=false), kein Start", killswitch.EnvEnabled)
@@ -98,6 +120,9 @@ func main() {
statusapi.NewServer(syncjob.NewStore(pool)).WithPolicy(policy).RegisterRoutes(mux)
dms2importapi.NewServer(mappings, dms2import.NewStore(pool)).RegisterRoutes(mux)
connectorsetupapi.NewServer(credentials, mappings).WithPolicy(policy).RegisterRoutes(mux)
if exports := buildDatevExports(pool); exports != nil {
datevapi.NewServer(exports, nil).WithPolicy(policy).RegisterRoutes(mux)
}
srv := &http.Server{
Addr: addr,
+33 -2
View File
@@ -9,6 +9,7 @@ import (
"net/http"
"time"
"gitea.perlbach24.de/scripte/nexarch/common/policyclient"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/datevexport"
"gitea.perlbach24.de/scripte/nexarch/connect/internal/datevtransfer"
)
@@ -16,6 +17,12 @@ import (
type Server struct {
Exports *datevexport.Store
Transfers *datevtransfer.Store
policy *policyclient.Client
}
func (s *Server) WithPolicy(client *policyclient.Client) *Server {
s.policy = client
return s
}
func NewServer(exports *datevexport.Store, transfers *datevtransfer.Store) *Server {
@@ -23,8 +30,32 @@ func NewServer(exports *datevexport.Store, transfers *datevtransfer.Store) *Serv
}
func (s *Server) RegisterRoutes(mux *http.ServeMux) {
mux.HandleFunc("POST /datev/exports", s.requireIdentity(s.handleTrigger))
mux.HandleFunc("GET /datev/exports", s.requireIdentity(s.handleList))
mux.HandleFunc("POST /datev/exports", s.requireIdentity(s.requirePermission("connect.datev.write", s.handleTrigger)))
mux.HandleFunc("GET /datev/exports", s.requireIdentity(s.requirePermission("connect.datev.read", s.handleList)))
}
func (s *Server) requirePermission(permission string, next func(w http.ResponseWriter, r *http.Request, tenantSlug string)) func(w http.ResponseWriter, r *http.Request, tenantSlug string) {
return func(w http.ResponseWriter, r *http.Request, tenantSlug string) {
if s.policy != nil {
allowed, err := s.policy.Allowed(r.Context(), tenantSlug, roleOf(r), permission)
if err != nil {
writeError(w, http.StatusServiceUnavailable, "berechtigungsdienst nicht erreichbar")
return
}
if !allowed {
writeError(w, http.StatusForbidden, "keine berechtigung")
return
}
}
next(w, r, tenantSlug)
}
}
func roleOf(r *http.Request) string {
if role := r.Header.Get("X-User-Role"); role != "" {
return role
}
return "user"
}
func (s *Server) requireIdentity(next func(w http.ResponseWriter, r *http.Request, tenantSlug string)) http.HandlerFunc {
@@ -0,0 +1,46 @@
package datevapi
import (
"encoding/json"
"net/http"
"net/http/httptest"
"strings"
"testing"
"gitea.perlbach24.de/scripte/nexarch/common/policyclient"
)
func TestPolicy_PermissionAndRoleReachCore(t *testing.T) {
type ask struct{ role, permission string }
var got []ask
policyAPI := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var body struct {
Role string `json:"role"`
Permission string `json:"permission"`
}
_ = json.NewDecoder(r.Body).Decode(&body)
got = append(got, ask{body.Role, body.Permission})
_ = json.NewEncoder(w).Encode(map[string]bool{"allowed": false})
}))
defer policyAPI.Close()
mux := http.NewServeMux()
(&Server{}).WithPolicy(policyclient.New(policyAPI.URL, "tok")).RegisterRoutes(mux)
for _, c := range []struct{ method, role string }{{"GET", "tenant_admin"}, {"POST", ""}} {
req := httptest.NewRequest(c.method, "/datev/exports", strings.NewReader("{}"))
req.Header.Set("X-User-Id", "u1")
req.Header.Set("X-Tenant-Slug", "acme")
if c.role != "" {
req.Header.Set("X-User-Role", c.role)
}
rec := httptest.NewRecorder()
mux.ServeHTTP(rec, req)
if rec.Code != http.StatusForbidden {
t.Fatalf("%s: erwartet 403, bekam %d", c.method, rec.Code)
}
}
want := []ask{{"tenant_admin", "connect.datev.read"}, {"user", "connect.datev.write"}}
if len(got) != 2 || got[0] != want[0] || got[1] != want[1] {
t.Fatalf("erwartet %v, bekam %v", want, got)
}
}
+9 -3
View File
@@ -22,8 +22,7 @@ type Server struct {
// WithPolicy aktiviert RBAC-12: echte Rechtepruefung gegen Core (POST
// /authorize), zusaetzlich zur bestehenden X-User-Id/X-Tenant-Slug-Pruefung.
// Rolle ist mangels eigenem Rollenkonzept in Connect fest "user" (Uebergang,
// wie beim restlichen Header-basierten Identitaetsmodell dieses Pakets).
// Die Rolle kommt aus X-User-Role (setzt bearerauth aus dem Token), sonst "user".
func (s *Server) WithPolicy(client *policyclient.Client) *Server {
s.policy = client
return s
@@ -40,7 +39,7 @@ func (s *Server) RegisterRoutes(mux *http.ServeMux) {
func (s *Server) requirePermission(permission string, next func(w http.ResponseWriter, r *http.Request, tenantSlug string)) func(w http.ResponseWriter, r *http.Request, tenantSlug string) {
return func(w http.ResponseWriter, r *http.Request, tenantSlug string) {
if s.policy != nil {
allowed, err := s.policy.Allowed(r.Context(), tenantSlug, "user", permission)
allowed, err := s.policy.Allowed(r.Context(), tenantSlug, roleOf(r), permission)
if err != nil {
writeError(w, http.StatusServiceUnavailable, "berechtigungsdienst nicht erreichbar")
return
@@ -54,6 +53,13 @@ func (s *Server) requirePermission(permission string, next func(w http.ResponseW
}
}
func roleOf(r *http.Request) string {
if role := r.Header.Get("X-User-Role"); role != "" {
return role
}
return "user"
}
func (s *Server) requireIdentity(next func(w http.ResponseWriter, r *http.Request, tenantSlug string)) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("X-User-Id") == "" {
@@ -60,3 +60,32 @@ func TestHandleList_PolicyAllows_Passes(t *testing.T) {
t.Fatalf("erwartet 200 mit berechtigung, bekam %d: %s", rec.Code, rec.Body.String())
}
}
func TestHandleList_RoleFromHeaderReachesPolicy(t *testing.T) {
var got []string
policyAPI := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var body struct {
Role string `json:"role"`
}
_ = json.NewDecoder(r.Body).Decode(&body)
got = append(got, body.Role)
_ = json.NewEncoder(w).Encode(map[string]bool{"allowed": true})
}))
defer policyAPI.Close()
s := newTestServer(t).WithPolicy(policyclient.New(policyAPI.URL, "test-token"))
mux := http.NewServeMux()
s.RegisterRoutes(mux)
for _, role := range []string{"tenant_admin", ""} {
req := httptest.NewRequest("GET", "/connectors/status", nil)
req.Header.Set("X-User-Id", "u1")
req.Header.Set("X-Tenant-Slug", "acme")
if role != "" {
req.Header.Set("X-User-Role", role)
}
mux.ServeHTTP(httptest.NewRecorder(), req)
}
if len(got) != 2 || got[0] != "tenant_admin" || got[1] != "user" {
t.Fatalf("erwartet [tenant_admin user], bekam %v", got)
}
}