a/gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add basic support for ipfs links

Browse Source 
shorten data variable names
add five parser tests
This commit is contained in:
Azareal 2021-04-05 16:03:53 +10:00
parent a9288d3e29
commit ba1d68eea7
2 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
common/parser.go
View File

@ -630,7 +630,7 @@ func ParseMessage2(msg string, sectionID int, sectionType string, settings *Pars
sb.Write(URLClose) sb.Write(URLClose)
lastItem = i lastItem = i
i-- i--
case 'h', 'f', 'g', '/': case 'h', 'f', 'g', '/', 'i':
//fmt.Println("s3") //fmt.Println("s3")
fch := msg[i+1] fch := msg[i+1]
if msg[i] == 'h' && fch == 't' && len(msg) > i+5 && msg[i+2] == 't' && msg[i+3] == 'p' { if msg[i] == 'h' && fch == 't' && len(msg) > i+5 && msg[i+2] == 't' && msg[i+3] == 'p' {
@ -646,6 +646,8 @@ func ParseMessage2(msg string, sectionID int, sectionType string, settings *Pars
// Do nothing // Do nothing
} else if fch == 'i' && msg[i+2] == 't' && msg[i+3] == ':' && msg[i+4] == '/' && msg[i] == 'g' { } else if fch == 'i' && msg[i+2] == 't' && msg[i+3] == ':' && msg[i+4] == '/' && msg[i] == 'g' {
// Do nothing // Do nothing
} else if msg[i] == 'i' && fch == 'p' && msg[i+2] == 'f' && msg[i+3] == 's' {
// Do nothing
} else if fch == '/' && msg[i] == '/' { } else if fch == '/' && msg[i] == '/' {
// Do nothing // Do nothing
} else { } else {
@ -865,25 +867,25 @@ func ParseMessage2(msg string, sectionID int, sectionType string, settings *Pars
} }
// 6, 7, 8, 6, 2, 7 // 6, 7, 8, 6, 2, 7
// ftp://, http://, https:// git://, //, mailto: (not a URL, just here for length comparison purposes) // ftp://, http://, https://, git://, ipfs://, //, mailto: (not a URL, just here for length comparison purposes)
// TODO: Write a test for this // TODO: Write a test for this
func validateURLString(data string) bool { func validateURLString(d string) bool {
i := 0 i := 0
if len(data) >= 6 { if len(d) >= 6 {
if data[0:6] == "ftp://" || data[0:6] == "git://" { if d[0:6] == "ftp://" || d[0:6] == "git://" {
i = 6 i = 6
} else if len(data) >= 7 && data[0:7] == "http://" { } else if len(d) >= 7 && (d[0:7] == "http://" || d[0:7] == "ipfs://") {
i = 7 i = 7
} else if len(data) >= 8 && data[0:8] == "https://" { } else if len(d) >= 8 && d[0:8] == "https://" {
i = 8 i = 8
} }
} else if len(data) >= 2 && data[0] == '/' && data[1] == '/' { } else if len(d) >= 2 && d[0] == '/' && d[1] == '/' {
i = 2 i = 2
} }
// ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s. // ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s.
for ; len(data) > i; i++ { for ; len(d) > i; i++ {
ch := data[i] ch := d[i]
if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 92) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [ if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 92) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [
return false return false
} }
@ -920,51 +922,51 @@ func validatedURLBytes(data []byte) (url []byte) {
} }
// TODO: Write a test for this // TODO: Write a test for this
func PartialURLString(data string) (url []byte) { func PartialURLString(d string) (url []byte) {
i := 0 i := 0
end := len(data) - 1 end := len(d) - 1
if len(data) >= 6 { if len(d) >= 6 {
if data[0:6] == "ftp://" || data[0:6] == "git://" { if d[0:6] == "ftp://" || d[0:6] == "git://" {
i = 6 i = 6
} else if len(data) >= 7 && data[0:7] == "http://" { } else if len(d) >= 7 && (d[0:7] == "http://" || d[0:7] == "ipfs://") {
i = 7 i = 7
} else if len(data) >= 8 && data[0:8] == "https://" { } else if len(d) >= 8 && d[0:8] == "https://" {
i = 8 i = 8
} }
} else if len(data) >= 2 && data[0] == '/' && data[1] == '/' { } else if len(d) >= 2 && d[0] == '/' && d[1] == '/' {
i = 2 i = 2
} }
// ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s. // ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s.
for ; end >= i; i++ { for ; end >= i; i++ {
ch := data[i] ch := d[i]
if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 92) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [ if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 92) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [
end = i end = i
} }
} }
url = append(url, []byte(data[0:end])...) url = append(url, []byte(d[0:end])...)
return url return url
} }
// TODO: Write a test for this // TODO: Write a test for this
// TODO: Handle the host bits differently from the paths... // TODO: Handle the host bits differently from the paths...
func PartialURLStringLen(data string) (int, bool) { func PartialURLStringLen(d string) (int, bool) {
i := 0 i := 0
if len(data) >= 6 { if len(d) >= 6 {
//log.Print(string(data[0:5])) //log.Print(string(d[0:5]))
if data[0:6] == "ftp://" || data[0:6] == "git://" { if d[0:6] == "ftp://" || d[0:6] == "git://" {
i = 6 i = 6
} else if len(data) >= 7 && data[0:7] == "http://" { } else if len(d) >= 7 && (d[0:7] == "http://" || d[0:7] == "ipfs://") {
i = 7 i = 7
} else if len(data) >= 8 && data[0:8] == "https://" { } else if len(d) >= 8 && d[0:8] == "https://" {
i = 8 i = 8
} }
} else if len(data) >= 2 && data[0] == '/' && data[1] == '/' { } else if len(d) >= 2 && d[0] == '/' && d[1] == '/' {
i = 2 i = 2
} }
//fmt.Println("Data Length: ",len(data)) //fmt.Println("Data Length: ",len(d))
if len(data) < i { if len(d) < i {
//fmt.Println("e1:",i) //fmt.Println("e1:",i)
return i + 1, false return i + 1, false
} }
@ -972,9 +974,9 @@ func PartialURLStringLen(data string) (int, bool) {
// ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s. // ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s.
f := i f := i
//fmt.Println("f:",f) //fmt.Println("f:",f)
for ; len(data) > i; i++ { for ; len(d) > i; i++ {
ch := data[i] //char ch := d[i] //char
if ch < 33 { // space and invisibles if ch < 33 { // space and invisibles
//fmt.Println("e2:",i) //fmt.Println("e2:",i)
return i, i != f return i, i != f
} else if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 92) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [ } else if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 92) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [
@ -994,31 +996,31 @@ func PartialURLStringLen(data string) (int, bool) {
// TODO: Write a test for this // TODO: Write a test for this
// TODO: Get this to support IPv6 hosts, this isn't currently done as this is used in the bbcode plugin where it thinks the [ is a IPv6 host // TODO: Get this to support IPv6 hosts, this isn't currently done as this is used in the bbcode plugin where it thinks the [ is a IPv6 host
func PartialURLStringLen2(data string) int { func PartialURLStringLen2(d string) int {
i := 0 i := 0
if len(data) >= 6 { if len(d) >= 6 {
//log.Print(string(data[0:5])) //log.Print(string(d[0:5]))
if data[0:6] == "ftp://" || data[0:6] == "git://" { if d[0:6] == "ftp://" || d[0:6] == "git://" {
i = 6 i = 6
} else if len(data) >= 7 && data[0:7] == "http://" { } else if len(d) >= 7 && (d[0:7] == "http://" || d[0:7] == "ipfs://") {
i = 7 i = 7
} else if len(data) >= 8 && data[0:8] == "https://" { } else if len(d) >= 8 && d[0:8] == "https://" {
i = 8 i = 8
} }
} else if len(data) >= 2 && data[0] == '/' && data[1] == '/' { } else if len(d) >= 2 && d[0] == '/' && d[1] == '/' {
i = 2 i = 2
} }
// ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s. // ? - There should only be one : and that's only if the URL is on a non-standard port. Same for ?s.
for ; len(data) > i; i++ { for ; len(d) > i; i++ {
ch := data[i] ch := d[i]
if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 91) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [ if ch != '\\' && ch != '_' && ch != '?' && ch != '&' && ch != '=' && ch != '@' && ch != '#' && ch != ']' && !(ch > 44 && ch < 60) && !(ch > 64 && ch < 91) && !(ch > 96 && ch < 123) { // 57 is 9, 58 is :, 59 is ;, 90 is Z, 91 is [
//log.Print("Bad Character: ", ch) //log.Print("Bad Character: ", ch)
return i return i
} }
} }
//log.Print("Data Length: ",len(data)) //log.Print("Data Length: ",len(d))
return len(data) return len(d)
} }
type MediaEmbed struct { type MediaEmbed struct {
@ -1056,6 +1058,11 @@ func parseMediaString(data string, settings *ParseSettings) (media MediaEmbed, o
} }
host := uurl.Hostname() host := uurl.Hostname()
scheme := uurl.Scheme scheme := uurl.Scheme
if scheme == "ipfs" {
media.FURL = data
media.URL = media.FURL
return media, true
}
port := uurl.Port() port := uurl.Port()
query, err := url.ParseQuery(uurl.RawQuery) query, err := url.ParseQuery(uurl.RawQuery)
if err != nil { if err != nil {

6
parser_test.go
View File

@ -178,10 +178,12 @@ func TestParser(t *testing.T) {
l.Add("<b>t</b>", "<b>t</b>") l.Add("<b>t</b>", "<b>t</b>")
l.Add("//", "//") l.Add("//", "//")
l.Add("http://", "<red>[Invalid URL]</red>") l.Add("http://", "<red>[Invalid URL]</red>")
l.Add("https://", "<red>[Invalid URL]</red>") //l.Add("https://", "<red>[Invalid URL]</red>")
l.Add("ipfs://", "<red>[Invalid URL]</red>")
l.Add("ftp://", "<red>[Invalid URL]</red>") l.Add("ftp://", "<red>[Invalid URL]</red>")
l.Add("git://", "<red>[Invalid URL]</red>") l.Add("git://", "<red>[Invalid URL]</red>")
l.Add("ssh://", "ssh://") l.Add("ssh://", "ssh://")
l.Add("fff://", "fff://")
l.Add("// ", "// ") l.Add("// ", "// ")
l.Add("// //", "// //") l.Add("// //", "// //")
@ -191,6 +193,7 @@ func TestParser(t *testing.T) {
l.Add("ftp:// ", "<red>[Invalid URL]</red> ") l.Add("ftp:// ", "<red>[Invalid URL]</red> ")
l.Add("git:// ", "<red>[Invalid URL]</red> ") l.Add("git:// ", "<red>[Invalid URL]</red> ")
l.Add("ssh:// ", "ssh:// ") l.Add("ssh:// ", "ssh:// ")
l.Add("fff:// ", "fff:// ")
l.Add("//t", "<a rel='ugc'href='//t'>t</a>") l.Add("//t", "<a rel='ugc'href='//t'>t</a>")
l.Add("// t", "// t") l.Add("// t", "// t")
@ -280,6 +283,7 @@ func TestParser(t *testing.T) {
l.Add("//"+u+"\n//"+u, "<a href='"+fs+"'>"+c.Site.URL+"</a><br><a href='"+fs+"'>"+c.Site.URL+"</a>") l.Add("//"+u+"\n//"+u, "<a href='"+fs+"'>"+c.Site.URL+"</a><br><a href='"+fs+"'>"+c.Site.URL+"</a>")
l.Add("http://"+u, "<a href='"+fs+"'>"+c.Site.URL+"</a>") l.Add("http://"+u, "<a href='"+fs+"'>"+c.Site.URL+"</a>")
l.Add("https://"+u, "<a href='"+fs+"'>"+c.Site.URL+"</a>") l.Add("https://"+u, "<a href='"+fs+"'>"+c.Site.URL+"</a>")
l.Add("ipfs://testthis", "<a rel='ugc'href='ipfs://testthis'>ipfs://testthis</a>")
l.Add("//"+u+"/attachs/sha256hash.webm?sid=1&stype=forums", "<video controls src=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"><a class='attach'href=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"download>Attachment</a></video>") l.Add("//"+u+"/attachs/sha256hash.webm?sid=1&stype=forums", "<video controls src=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"><a class='attach'href=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"download>Attachment</a></video>")
l.Add("//"+u+"/attachs/sha256hash.webm", "<video controls src=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"><a class='attach'href=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"download>Attachment</a></video>") l.Add("//"+u+"/attachs/sha256hash.webm", "<video controls src=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"><a class='attach'href=\""+fs+"/attachs/sha256hash.webm?sid=1&amp;stype=forums\"download>Attachment</a></video>")