Skip to content

make remote host a real url #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CosmicToast wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make remote host a real url #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dc65f0
make remote host a real url
CosmicToast Nov 27, 2023
da866d5
panic on (typically impossible) errors
CosmicToast Nov 28, 2023
f07090f
improve url parsing
CosmicToast Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions src/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ func GetApp() cli.App {
config_show := cli.NewCommand("show", "print current config").
WithAction(func(args []string, options map[string]string) int {
p := getPersistance(options)
remote := p.State.RemoteHostname
if remote == "" {
remote = "(None)"
remote := "(None)"
if p.State.RemoteURL != nil {
remote = p.State.RemoteURL.Host
}

fmt.Printf("Encryption Key: \t%v\n", p.State.Key)
Expand Down Expand Up @@ -231,10 +231,25 @@ func GetApp() cli.App {
p := getPersistance(options)

url, err := url.ParseRequestURI(host)
if err != nil {
p.State.RemoteHostname = "http://" + host
if err == nil {
// url parsed fine, use it
// ensure it's http(s)
if !strings.HasPrefix(url.Scheme, "http") {
url.Scheme = "https"
fmt.Println("Warning: only http(s) in URLs is supported, defaulting to https: ", url)
}
// ensure there's a terminal /
// note that this doesn't handle the escaped path or the raw path
if url.Path != "" && !strings.HasSuffix(url.Path, "/") {
url.Path += "/"
}
p.State.RemoteURL = url
} else {
p.State.RemoteHostname = url.String()
// only warn if the user isn't intentionally unsetting the remote
if host != "" {
fmt.Println("Invalid url, unsetting remote: ", err.Error())
}
p.State.RemoteURL = url
}

err = p.CommitState()
Expand Down Expand Up @@ -266,7 +281,11 @@ func GetApp() cli.App {
logger.Fatal("Key not found.")
}

fmt.Println(p.State.RemoteHostname + "/get?q=" + entry.UrlToken)
u, _ := p.State.RemoteURL.Parse("get") // this should never fail
q := u.Query()
q.Set("q", entry.UrlToken)
u.RawQuery = q.Encode()
fmt.Println(u)
return 0
})
qr := cli.NewCommand("qr", "print shareable qr code of entry to console").
Expand All @@ -289,9 +308,11 @@ func GetApp() cli.App {
logger.Fatal("Key not found.")
}

url := p.State.RemoteHostname + "/get?q=" + entry.UrlToken

qrcode.QRCode(url, qrcode.BrightBlack, qrcode.BrightWhite, qr.Low)
url, _ := p.State.RemoteURL.Parse("get") // this should never fail
q := url.Query()
q.Set("q", entry.UrlToken)
url.RawQuery = q.Encode()
qrcode.QRCode(url.String(), qrcode.BrightBlack, qrcode.BrightWhite, qr.Low)

return 0
})
Expand Down
33 changes: 20 additions & 13 deletions src/sqlite_persistance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ import (
"modernc.org/mathutil"
_ "modernc.org/sqlite"
"net/http"
"net/url"
"os"
)

type SqliteState struct {
Counter uint64
Pid uint32
Key string
RemoteHostname string
RemoteCounter uint64
SchemaVersion uint32
Counter uint64
Pid uint32
Key string
RemoteURL *url.URL
RemoteCounter uint64
SchemaVersion uint32
}

type SqlitePersistance struct {
Expand All @@ -36,7 +37,7 @@ type SqlitePersistance struct {
}

func (p *SqlitePersistance) GetRemoteUpdates() (err error) {
if p.State.RemoteHostname == "" {
if p.State.RemoteURL == nil {
return nil
}
request, err := json.Marshal(UpdateRequest{ProcessID: p.State.Pid, Counter: p.State.RemoteCounter})
Expand All @@ -49,7 +50,11 @@ func (p *SqlitePersistance) GetRemoteUpdates() (err error) {
return err
}

resp, err := http.Post(p.State.RemoteHostname+"/pull", "application/json", bytes.NewReader(request))
pull, err := p.State.RemoteURL.Parse("pull")
if err != nil {
panic(err)
}
resp, err := http.Post(pull.String(), "application/json", bytes.NewReader(request))
if err != nil {
return err
}
Expand Down Expand Up @@ -81,9 +86,7 @@ func (p *SqlitePersistance) GetRemoteUpdates() (err error) {

func (p *SqlitePersistance) Push() error {
// push changes to remote

host := p.State.RemoteHostname
if host == "" {
if p.State.RemoteURL == nil {
return nil
}
updates, err := p.GetUpdates(UpdateRequest{Counter: p.State.RemoteCounter, ProcessID: ReservedProcessID})
Expand All @@ -99,7 +102,11 @@ func (p *SqlitePersistance) Push() error {
panic(err)
}

resp, err := http.DefaultClient.Post(host+"/push", "application/json", bytes.NewReader(payload))
push, err := p.State.RemoteURL.Parse("push")
if err != nil {
panic(err)
}
resp, err := http.DefaultClient.Post(push.String(), "application/json", bytes.NewReader(payload))
if err != nil || resp.StatusCode != 200 {
return fmt.Errorf("Error posting update to server: %v", err)
} else {
Expand Down Expand Up @@ -173,7 +180,7 @@ func NewSqlitePersistance(path string) (*SqlitePersistance, error) {
} else {
// init DB
_, err := db.Exec(`
create table if not exists entries (key, value, timestamp, pid, counter, urltoken);
create table if not exists entries (key, value, timestamp, pid, counter, urltoken);
create table if not exists state (state);`)

if err != nil {
Expand Down