dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign gets

This commit is contained in:
Ted Unangst 2022-05-20 15:50:33 -04:00
parent 47b644e370
commit f455f5a9ea
5 changed files with 71 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
activity.go
View File

@ -102,22 +102,22 @@ func PostMsg(keyname string, key httpsig.PrivateKey, url string, msg []byte) err
return nil return nil
} }
func GetJunk(url string) (junk.Junk, error) { func GetJunk(userid int64, url string) (junk.Junk, error) {
return GetJunkTimeout(url, slowTimeout*time.Second) return GetJunkTimeout(userid, url, slowTimeout*time.Second)
} }
func GetJunkFast(url string) (junk.Junk, error) { func GetJunkFast(userid int64, url string) (junk.Junk, error) {
return GetJunkTimeout(url, fastTimeout*time.Second) return GetJunkTimeout(userid, url, fastTimeout*time.Second)
} }
func GetJunkHardMode(url string) (junk.Junk, error) { func GetJunkHardMode(userid int64, url string) (junk.Junk, error) {
j, err := GetJunk(url) j, err := GetJunk(userid, url)
if err != nil { if err != nil {
emsg := err.Error() emsg := err.Error()
if emsg == "http get status: 502" || strings.Contains(emsg, "timeout") { if emsg == "http get status: 502" || strings.Contains(emsg, "timeout") {
ilog.Printf("trying again after error: %s", emsg) ilog.Printf("trying again after error: %s", emsg)
time.Sleep(time.Duration(60+notrand.Int63n(60)) * time.Second) time.Sleep(time.Duration(60+notrand.Int63n(60)) * time.Second)
j, err = GetJunk(url) j, err = GetJunk(userid, url)
if err != nil { if err != nil {
ilog.Printf("still couldn't get it") ilog.Printf("still couldn't get it")
} else { } else {
@ -130,7 +130,48 @@ func GetJunkHardMode(url string) (junk.Junk, error) {
var flightdeck = gate.NewSerializer() var flightdeck = gate.NewSerializer()
func GetJunkTimeout(url string, timeout time.Duration) (junk.Junk, error) { var signGets = true
func junkGet(userid int64, url string, args junk.GetArgs) (junk.Junk, error) {
client := http.DefaultClient
if args.Client != nil {
client = args.Client
}
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
}
if args.Accept != "" {
req.Header.Set("Accept", args.Accept)
}
if args.Agent != "" {
req.Header.Set("User-Agent", args.Agent)
}
if signGets {
var ki *KeyInfo
ok := ziggies.Get(userid, &ki)
if ok {
httpsig.SignRequest(ki.keyname, ki.seckey, req, nil)
}
}
if args.Timeout != 0 {
ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
defer cancel()
req = req.WithContext(ctx)
}
resp, err := client.Do(req)
if err != nil {
return nil, err
}
defer resp.Body.Close()
if resp.StatusCode != 200 {
return nil, fmt.Errorf("http get status: %d", resp.StatusCode)
}
return junk.Read(resp.Body)
}
func GetJunkTimeout(userid int64, url string, timeout time.Duration) (junk.Junk, error) {
client := http.DefaultClient client := http.DefaultClient
if develMode { if develMode {
client = develClient client = develClient
@ -140,7 +181,7 @@ func GetJunkTimeout(url string, timeout time.Duration) (junk.Junk, error) {
if strings.Contains(url, ".well-known/webfinger?resource") { if strings.Contains(url, ".well-known/webfinger?resource") {
at = "application/jrd+json" at = "application/jrd+json"
} }
j, err := junk.Get(url, junk.GetArgs{ j, err := junkGet(userid, url, junk.GetArgs{
Accept: at, Accept: at,
Agent: "honksnonk/5.0; " + serverName, Agent: "honksnonk/5.0; " + serverName,
Timeout: timeout, Timeout: timeout,
@ -330,7 +371,7 @@ var boxofboxes = cache.New(cache.Options{Filler: func(ident string) (*Box, bool)
if err != nil { if err != nil {
dlog.Printf("need to get boxes for %s", ident) dlog.Printf("need to get boxes for %s", ident)
var j junk.Junk var j junk.Junk
j, err = GetJunk(ident) j, err = GetJunk(serverUID, ident)
if err != nil { if err != nil {
dlog.Printf("error getting boxes: %s", err) dlog.Printf("error getting boxes: %s", err)
return nil, false return nil, false
@ -349,7 +390,7 @@ var boxofboxes = cache.New(cache.Options{Filler: func(ident string) (*Box, bool)
func gimmexonks(user *WhatAbout, outbox string) { func gimmexonks(user *WhatAbout, outbox string) {
dlog.Printf("getting outbox: %s", outbox) dlog.Printf("getting outbox: %s", outbox)
j, err := GetJunk(outbox) j, err := GetJunk(user.ID, outbox)
if err != nil { if err != nil {
ilog.Printf("error getting outbox: %s", err) ilog.Printf("error getting outbox: %s", err)
return return
@ -368,7 +409,7 @@ func gimmexonks(user *WhatAbout, outbox string) {
} else { } else {
page1, ok := j.GetString("first") page1, ok := j.GetString("first")
if ok { if ok {
j, err = GetJunk(page1) j, err = GetJunk(user.ID, page1)
if err != nil { if err != nil {
ilog.Printf("error gettings page1: %s", err) ilog.Printf("error gettings page1: %s", err)
return return
@ -394,7 +435,7 @@ func gimmexonks(user *WhatAbout, outbox string) {
if !needxonkid(user, xid) { if !needxonkid(user, xid) {
continue continue
} }
obj, err = GetJunk(xid) obj, err = GetJunk(user.ID, xid)
if err != nil { if err != nil {
ilog.Printf("error getting item: %s", err) ilog.Printf("error getting item: %s", err)
continue continue
@ -478,7 +519,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
ilog.Printf("in too deep") ilog.Printf("in too deep")
return return
} }
obj, err := GetJunkHardMode(xid) obj, err := GetJunkHardMode(user.ID, xid)
if err != nil { if err != nil {
ilog.Printf("error getting onemore: %s: %s", xid, err) ilog.Printf("error getting onemore: %s: %s", xid, err)
return return
@ -546,7 +587,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
return nil return nil
} }
dlog.Printf("getting bonk: %s", xid) dlog.Printf("getting bonk: %s", xid)
obj, err = GetJunkHardMode(xid) obj, err = GetJunkHardMode(user.ID, xid)
if err != nil { if err != nil {
ilog.Printf("error getting bonk: %s: %s", xid, err) ilog.Printf("error getting bonk: %s: %s", xid, err)
} }
@ -564,7 +605,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
ilog.Printf("out of bounds %s not from %s", xid, origin) ilog.Printf("out of bounds %s not from %s", xid, origin)
return nil return nil
} }
obj, err = GetJunkHardMode(xid) obj, err = GetJunkHardMode(user.ID, xid)
if err != nil { if err != nil {
ilog.Printf("error getting creation: %s", err) ilog.Printf("error getting creation: %s", err)
} }
@ -581,7 +622,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
dlog.Printf("don't need read obj: %s", xid) dlog.Printf("don't need read obj: %s", xid)
return nil return nil
} }
obj, err = GetJunkHardMode(xid) obj, err = GetJunkHardMode(user.ID, xid)
if err != nil { if err != nil {
ilog.Printf("error getting read: %s", err) ilog.Printf("error getting read: %s", err)
return nil return nil
@ -597,7 +638,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
dlog.Printf("don't need added obj: %s", xid) dlog.Printf("don't need added obj: %s", xid)
return nil return nil
} }
obj, err = GetJunkHardMode(xid) obj, err = GetJunkHardMode(user.ID, xid)
if err != nil { if err != nil {
ilog.Printf("error getting add: %s", err) ilog.Printf("error getting add: %s", err)
return nil return nil
@ -1540,7 +1581,7 @@ var handfull = cache.New(cache.Options{Filler: func(name string) (string, bool)
return href, true return href, true
} }
dlog.Printf("fishing for %s", name) dlog.Printf("fishing for %s", name)
j, err := GetJunkFast(fmt.Sprintf("https://%s/.well-known/webfinger?resource=acct:%s", m[1], name)) j, err := GetJunkFast(serverUID, fmt.Sprintf("https://%s/.well-known/webfinger?resource=acct:%s", m[1], name))
if err != nil { if err != nil {
ilog.Printf("failed to go fish %s: %s", name, err) ilog.Printf("failed to go fish %s: %s", name, err)
return "", true return "", true
@ -1585,7 +1626,7 @@ func investigate(name string) (*SomeThing, error) {
if name == "" { if name == "" {
return nil, fmt.Errorf("no name") return nil, fmt.Errorf("no name")
} }
obj, err := GetJunkFast(name) obj, err := GetJunkFast(serverUID, name)
if err != nil { if err != nil {
return nil, err return nil, err
} }

12
database.go
View File

@ -56,11 +56,6 @@ func userfromrow(row *sql.Row) (*WhatAbout, error) {
if user.Options.Reaction == "" { if user.Options.Reaction == "" {
user.Options.Reaction = "none" user.Options.Reaction = "none"
} }
var marker mz.Marker
marker.HashLinker = ontoreplacer
marker.AtLinker = attoreplacer
user.HTAbout = template.HTML(marker.Mark(user.About))
user.Onts = marker.HashTags
return user, nil return user, nil
} }
@ -71,6 +66,11 @@ var somenamedusers = cache.New(cache.Options{Filler: func(name string) (*WhatAbo
if err != nil { if err != nil {
return nil, false return nil, false
} }
var marker mz.Marker
marker.HashLinker = ontoreplacer
marker.AtLinker = attoreplacer
user.HTAbout = template.HTML(marker.Mark(user.About))
user.Onts = marker.HashTags
return user, true return user, true
}}) }})
@ -80,6 +80,8 @@ var somenumberedusers = cache.New(cache.Options{Filler: func(userid int64) (*Wha
if err != nil { if err != nil {
return nil, false return nil, false
} }
// don't touch attoreplacer, which introduces a loop
// finger -> getjunk -> keys -> users
return user, true return user, true
}}) }})

2
fun.go
View File

@ -637,7 +637,7 @@ var zaggies = cache.New(cache.Options{Filler: func(keyname string) (httpsig.Publ
if data == "" { if data == "" {
var key httpsig.PublicKey var key httpsig.PublicKey
dlog.Printf("hitting the webs for missing pubkey: %s", keyname) dlog.Printf("hitting the webs for missing pubkey: %s", keyname)
j, err := GetJunk(keyname) j, err := GetJunk(serverUID, keyname)
if err != nil { if err != nil {
ilog.Printf("error getting %s pubkey: %s", keyname, err) ilog.Printf("error getting %s pubkey: %s", keyname, err)
when := time.Now().UTC().Format(dbtimeformat) when := time.Now().UTC().Format(dbtimeformat)

1
honk.go
View File

@ -322,6 +322,7 @@ func main() {
getconfig("devel", &develMode) getconfig("devel", &develMode)
getconfig("fasttimeout", &fastTimeout) getconfig("fasttimeout", &fastTimeout)
getconfig("slowtimeout", &slowTimeout) getconfig("slowtimeout", &slowTimeout)
getconfig("signGets", &signGets)
prepareStatements(db) prepareStatements(db)
switch cmd { switch cmd {
case "admin": case "admin":

2
web.go
View File

@ -551,7 +551,7 @@ func ximport(w http.ResponseWriter, r *http.Request) {
if p != nil { if p != nil {
xid = p.XID xid = p.XID
} }
j, err := GetJunk(xid) j, err := GetJunk(u.UserID, xid)
if err != nil { if err != nil {
http.Error(w, "error getting external object", http.StatusInternalServerError) http.Error(w, "error getting external object", http.StatusInternalServerError)
ilog.Printf("error getting external object: %s", err) ilog.Printf("error getting external object: %s", err)