1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-09 22:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parse URIs correctly

Browse Source
This commit is contained in:
Kegan Dougal 2020-05-28 12:28:21 +01:00
parent a6f995eb45
commit 2411007c4b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
serverkeyapi/storage/sqlite3/keydb.go
View File

@ -17,6 +17,8 @@ package sqlite3
import (
"context"
"errors"
"net/url"
"time"
"golang.org/x/crypto/ed25519"
@ -44,7 +46,19 @@ func NewDatabase(
serverKey ed25519.PublicKey,
serverKeyID gomatrixserverlib.KeyID,
) (*Database, error) {
db, err := sqlutil.Open(internal.SQLiteDriverName(), dataSourceName, nil)
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
}
var cs string
if uri.Opaque != "" { // file:filename.db
cs = uri.Opaque
} else if uri.Path != "" { // file:///path/to/filename.db
cs = uri.Path
} else {
return nil, errors.New("no filename or path in connect string")
}
db, err := sqlutil.Open(internal.SQLiteDriverName(), cs, nil)
if err != nil {
return nil, err
}