Skip to content

Url parser extensions #2

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
archerD wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Url parser extensions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
26e75a8
added new test cases for urls
DMind44 Oct 20, 2020
54a9a72
Parsing URLs that do not have a authority component
archerD Oct 21, 2020
7762ac1
Increasing the robustness of the URL parser for passwords
archerD Oct 21, 2020
1453d99
Rewrote the no authority case for urls and updated prettyprinting to
archerD Oct 21, 2020
0e8bace
fixed matching empty port
DMind44 Oct 21, 2020
43433f8
added upper bound for port number
DMind44 Oct 22, 2020
997562e
Updated the url parsing to accept an empty username.
archerD Oct 28, 2020
2f6da6d
check if port is valid
DMind44 Oct 28, 2020
6b24b3a
Merge branch 'urltesting' of https://github.com/factor-hmc/factor int…
DMind44 Oct 28, 2020
95b9866
Updated the url tests to test new extensions to the url library.
archerD Oct 28, 2020
710c44b
Updating the style for recently added extensions to urls.factor.
archerD Oct 28, 2020
5c729cf
removed sanity check for port, want to allow for IPvX support
DMind44 Oct 29, 2020
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: 41 additions & 0 deletions basis/urls/urls-tests.factor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,33 @@ CONSTANT: urls {
}
"t1000://www.google.com/"
}
{
T{ url
{ protocol "no-auth" }
{ path "/some/random/path" }
}
"no-auth:/some/random/path"
}
{
T{ url
{ protocol "http" }
{ host "example.org" }
{ path "/" }
{ username "user" }
{ password "" }
}
"http://user:@example.org/"
}
{
T{ url
{ protocol "http" }
{ host "example.org" }
{ path "/" }
{ username "" }
{ password "pass" }
}
"http://:pass@example.org/"
}
}

urls [
Expand All @@ -125,6 +152,20 @@ urls [
swap [ 1array ] [ [ present ] curry ] bi* unit-test
] assoc-each

{ T{ url
{ protocol "https" }
{ host "www.google.com" }
{ path "/" }
} }
[ "https://www.google.com:/" >url ] unit-test

{ "https://www.google.com/" }
[ T{ url
{ protocol "https" }
{ host "www.google.com" }
{ path "/" }
} present ] unit-test

{ "b" } [ "a" "b" url-append-path ] unit-test

{ "a/b" } [ "a/c" "b" url-append-path ] unit-test
Expand Down
28 changes: 14 additions & 14 deletions basis/urls/urls.factor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ USING: accessors arrays ascii assocs combinators fry
io.pathnames io.sockets io.sockets.secure kernel lexer
linked-assocs make math.parser multiline namespaces peg.ebnf
present sequences splitting strings strings.parser urls.encoding
vocabs.loader ;
vocabs.loader math math.order ;

IN: urls

Expand All @@ -30,7 +30,10 @@ ERROR: malformed-port ;
: parse-host ( string -- host/f port/f )
[
":" split1-last [ url-decode ]
[ dup [ string>number [ malformed-port ] unless* ] when ] bi*
[ [ f ]
[ string>number [ malformed-port ] unless* ]
if-empty
] bi*
] [ f f ] if* ;

GENERIC: >url ( obj -- url )
Expand All @@ -44,8 +47,8 @@ M: url >url ;
EBNF: parse-url [=[

protocol = [a-zA-Z0-9.+-]+ => [[ url-decode ]]
username = [^/:@#?]+ => [[ url-decode ]]
password = [^/:@#?]+ => [[ url-decode ]]
username = [^/:@#?]* => [[ url-decode ]]
password = [^/:@#?]* => [[ url-decode ]]
pathname = [^#?]+ => [[ url-decode ]]
query = [^#]+ => [[ query>assoc ]]
anchor = .+ => [[ url-decode ]]
Expand All @@ -58,7 +61,8 @@ auth = (username (":" password => [[ second ]])? "@"
=> [[ first2 2array ]])?

url = (((protocol "://") => [[ first ]] auth hostname)
| (("//") => [[ f ]] auth hostname))?
| (("//") => [[ f ]] auth hostname)
| ((protocol ":") => [[ first V{ f f } V{ } 2sequence ]]))?
(pathname)?
("?" query => [[ second ]])?
("#" anchor => [[ second ]])?
Expand Down Expand Up @@ -117,20 +121,16 @@ M: pathname >url string>> >url ;

! URL" //foo.com" takes on the protocol of the url it's derived from
: unparse-protocol ( url -- )
dup protocol>> [
% "://" % unparse-host-part
] [
dup host>> [
"//" % unparse-host-part
] [
drop
] if
] if* ;
protocol>> [ % ":" % ] when* ;

: unparse-authority ( url -- )
dup host>> [ "//" % unparse-host-part ] [ drop ] if ;

M: url present
[
{
[ unparse-protocol ]
[ unparse-authority ]
[ path>> url-encode % ]
[ query>> dup assoc-empty? [ drop ] [ "?" % assoc>query % ] if ]
[ anchor>> [ "#" % present url-encode % ] when* ]
Expand Down