Merge pull request #15 from bat-bs/reporting

Fix Error: DB Closed

Author: hofq

apiproxy/proxy.go

@@ -124,6 +124,7 @@ func (h *baseHandle) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (h *baseHandle) HandleAzure(w http.ResponseWriter, r *http.Request, backend string) {
 	azureToken := ValidateToken(w, r)
 	if azureToken == "" {
+		http.Error(w, "Error Processing Request", http.StatusUnauthorized)
 		return
 	}
 	r.Header.Set("Content-Type", "application/json")

apiproxy/response.go

@@ -39,7 +39,6 @@ func NewResponse(in *http.Response) error {
 		return err
 	}
 	go r.ProcessValues()
-	defer r.db.Close()
 	return nil
 }
 
@@ -54,7 +53,6 @@ func (r *Response) GetApiKeyUUID() string {
 	}
 
 	uid, err := CompareToken(hashes, apiKey)
-	log.Println(uid, err)
 	return uid
 }
 func (r *Response) ReadValues() error {
@@ -71,6 +69,7 @@ func (r *Response) ReadValues() error {
 }
 
 func (r *Response) ProcessValues() {
+	defer r.db.Close()
 	c := r.content
 	if c.Object != "chat.completion" {
 		log.Printf("Untested API Endpoint '%s' is used, check the Request in the DB: %s", c.Object, c.ID)
@@ -92,6 +91,5 @@ func (r *Response) ProcessValues() {
 		log.Println(err)
 		return
 	}
-	log.Println("Written Request to DB")
 
 }

apiproxy/validateToken.go

@@ -32,11 +32,11 @@ func ValidateToken(w http.ResponseWriter, r *http.Request) string {
 	//fmt.Println("\"", apiKey, "\"")
 	if apiKey == "Bearer " {
 		http.Error(w, "401 - Token Empty", http.StatusUnauthorized)
+
 		return ""
 	}
 
 	db := db.NewDB()
-	defer db.Close()
 
 	hashes, err := db.LookupApiKeys("*")
 	if err != nil || len(hashes) == 0 {