mirror of
https://github.com/taigrr/wails.git
synced 2026-04-14 10:50:53 -07:00
Compare commits
1 Commits
obfuscatio
...
1003-handl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77e9dfd412 |
@@ -8,7 +8,7 @@ func TranslateUriToFile(uri string, expectedScheme string, expectedHost string)
|
|||||||
return "", false, err
|
return "", false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if url.Scheme != expectedScheme || url.Host != expectedHost {
|
if url.Scheme != expectedScheme || (len(expectedHost) > 0 && url.Host != expectedHost) {
|
||||||
return "", false, nil
|
return "", false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import "C"
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -342,11 +343,22 @@ func (f *Frontend) processRequest(request unsafe.Pointer) {
|
|||||||
|
|
||||||
// Load file from asset store
|
// Load file from asset store
|
||||||
content, mimeType, err := f.assets.Load(file)
|
content, mimeType, err := f.assets.Load(file)
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO How to return 404/500 errors to webkit?
|
// TODO How to return 404/500 errors to webkit?
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
message := C.CString("not found")
|
||||||
|
defer C.free(unsafe.Pointer(message))
|
||||||
|
C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(404), message))
|
||||||
|
} else {
|
||||||
|
err = fmt.Errorf("Error processing request %s: %w", uri, err)
|
||||||
|
f.logger.Error(err.Error())
|
||||||
|
message := C.CString("internal server error")
|
||||||
|
defer C.free(unsafe.Pointer(message))
|
||||||
|
C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(500), message))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cContent := C.CString(string(content))
|
cContent := C.CString(string(content))
|
||||||
defer C.free(unsafe.Pointer(cContent))
|
defer C.free(unsafe.Pointer(cContent))
|
||||||
|
|||||||
Reference in New Issue
Block a user