diff --git a/core/byte-arrays/byte-arrays-docs.factor b/core/byte-arrays/byte-arrays-docs.factor index 27df8771c3..8a51f4c663 100755 --- a/core/byte-arrays/byte-arrays-docs.factor +++ b/core/byte-arrays/byte-arrays-docs.factor @@ -26,5 +26,6 @@ HELP: ( n -- byte-array ) HELP: >byte-array { $values { "seq" "a sequence" } { "byte-array" byte-array } } -{ $description "Outputs a freshly-allocated byte array whose elements have the same boolean values as a given sequence." } +{ $description + "Outputs a freshly-allocated byte array whose elements have the same signed byte values as a given sequence." } { $errors "Throws an error if the sequence contains elements other than integers." } ; diff --git a/core/debugger/debugger.factor b/core/debugger/debugger.factor index ad74889236..e6dfb79e07 100755 --- a/core/debugger/debugger.factor +++ b/core/debugger/debugger.factor @@ -7,7 +7,7 @@ splitting math.parser classes.tuple continuations continuations.private combinators generic.math classes.builtin classes compiler.units generic.standard vocabs threads threads.private init kernel.private libc io.encodings -mirrors accessors math.order ; +mirrors accessors math.order destructors ; IN: debugger GENERIC: error. ( error -- ) @@ -300,6 +300,8 @@ M: bad-create summary drop "Bad parameters to create" ; M: attempt-all-error summary drop "Nothing to attempt" ; +M: already-disposed summary drop "Attempting to operate on disposed object" ; + ( handle -- stream ) f c-writer boa ; M: c-writer stream-write1 + dup check-disposed handle>> fputc ; M: c-writer stream-write + dup check-disposed handle>> fwrite ; M: c-writer stream-flush + dup check-disposed handle>> fflush ; M: c-writer dispose* @@ -26,12 +29,14 @@ TUPLE: c-reader handle disposed ; : ( handle -- stream ) f c-reader boa ; M: c-reader stream-read + dup check-disposed handle>> fread ; M: c-reader stream-read-partial stream-read ; M: c-reader stream-read1 + dup check-disposed handle>> fgetc ; : read-until-loop ( stream delim -- ch ) @@ -42,6 +47,7 @@ M: c-reader stream-read1 ] if ; M: c-reader stream-read-until + dup check-disposed [ swap read-until-loop ] B{ } make swap over empty? over not and [ 2drop f f ] when ; diff --git a/extra/builder/benchmark/benchmark.factor b/extra/builder/benchmark/benchmark.factor deleted file mode 100644 index afe277d30b..0000000000 --- a/extra/builder/benchmark/benchmark.factor +++ /dev/null @@ -1,43 +0,0 @@ - -USING: kernel continuations arrays assocs sequences sorting math - io io.styles prettyprint builder.util ; - -IN: builder.benchmark - -! : passing-benchmarks ( table -- table ) -! [ second first2 number? swap number? and ] filter ; - -: passing-benchmarks ( table -- table ) [ second number? ] filter ; - -! : simplify-table ( table -- table ) [ first2 second 2array ] map ; - -: benchmark-difference ( old-table benchmark-result -- result-diff ) - first2 >r - tuck swap at - r> - swap - - 2array ; - -: compare-tables ( old new -- table ) - [ passing-benchmarks ] bi@ - [ benchmark-difference ] with map ; - -: benchmark-deltas ( -- table ) - "../benchmarks" "benchmarks" [ eval-file ] bi@ - compare-tables - sort-values ; - -: benchmark-deltas. ( deltas -- ) - standard-table-style - [ - [ [ "Benchmark" write ] with-cell [ "Delta (ms)" write ] with-cell ] - with-row - [ [ swap [ write ] with-cell pprint-cell ] with-row ] - assoc-each - ] - tabular-output ; - -: show-benchmark-deltas ( -- ) - [ benchmark-deltas benchmark-deltas. ] - [ drop "Error generating benchmark deltas" . ] - recover ; \ No newline at end of file diff --git a/extra/builder/util/util.factor b/extra/builder/util/util.factor index f9ab6c1d1d..db3b476365 100644 --- a/extra/builder/util/util.factor +++ b/extra/builder/util/util.factor @@ -41,12 +41,17 @@ DEFER: to-strings : host-name* ( -- name ) host-name "." split first ; +! : datestamp ( -- string ) +! now `{ ,[ dup timestamp-year ] +! ,[ dup timestamp-month ] +! ,[ dup timestamp-day ] +! ,[ dup timestamp-hour ] +! ,[ timestamp-minute ] } +! [ pad-00 ] map "-" join ; + : datestamp ( -- string ) - now `{ ,[ dup timestamp-year ] - ,[ dup timestamp-month ] - ,[ dup timestamp-day ] - ,[ dup timestamp-hour ] - ,[ timestamp-minute ] } + now + { year>> month>> day>> hour>> minute>> } [ pad-00 ] map "-" join ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/cocoa/application/application-docs.factor b/extra/cocoa/application/application-docs.factor index 01a79cf35a..55fa5e10b8 100644 --- a/extra/cocoa/application/application-docs.factor +++ b/extra/cocoa/application/application-docs.factor @@ -27,8 +27,8 @@ HELP: with-cocoa { $description "Sets up an autorelease pool, initializes the " { $snippet "NSApplication" } " singleton, and calls the quotation." } ; HELP: do-event -{ $values { "app" "an " { $snippet "NSApplication" } } } -{ $description "Processes any pending events in the queue. Does not block." } ; +{ $values { "app" "an " { $snippet "NSApplication" } } { "?" "a boolean" } } +{ $description "Processes a pending event in the queue, if any, returning a boolean indicating if there was one. Does not block." } ; HELP: add-observer { $values { "observer" "an " { $snippet "NSObject" } } { "selector" string } { "name" "an " { $snippet "NSString" } } { "object" "an " { $snippet "NSObject" } } } diff --git a/extra/ftp/client/client.factor b/extra/ftp/client/client.factor index 8cefbcbb43..642d2ce8cd 100644 --- a/extra/ftp/client/client.factor +++ b/extra/ftp/client/client.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays classes.singleton combinators -continuations io io.encodings.binary io.encodings.ascii +continuations io io.encodings.binary io.encodings.utf8 io.files io.sockets kernel io.streams.duplex math math.parser sequences splitting namespaces strings fry ftp ; IN: ftp.client @@ -56,15 +56,17 @@ IN: ftp.client "|" split 2 tail* first string>number ; TUPLE: remote-file - type permissions links owner group size month day time year name ; +type permissions links owner group size month day time year +name target ; : ( -- remote-file ) remote-file new ; : parse-permissions ( remote-file str -- remote-file ) [ first ch>type >>type ] [ rest >>permissions ] bi ; -: parse-list-9 ( lines -- seq ) +: parse-list-11 ( lines -- seq ) [ + 11 f pad-right swap { [ 0 swap nth parse-permissions ] [ 1 swap nth string>number >>links ] @@ -75,6 +77,7 @@ TUPLE: remote-file [ 6 swap nth >>day ] [ 7 swap nth >>time ] [ 8 swap nth >>name ] + [ 10 swap nth >>target ] } cleave ] map ; @@ -105,7 +108,8 @@ TUPLE: remote-file dup strings>> [ " " split harvest ] map dup length { - { 9 [ parse-list-9 ] } + { 11 [ parse-list-11 ] } + { 9 [ parse-list-11 ] } { 8 [ parse-list-8 ] } { 3 [ parse-list-3 ] } [ drop ] @@ -129,7 +133,7 @@ ERROR: ftp-error got expected ; [ 229 ftp-assert ] [ parse-epsv ] bi ; : list ( ftp-client -- ftp-response ) - host>> open-remote-port ascii + host>> open-remote-port utf8 drop ftp-list 150 ftp-assert lines swap >>strings @@ -137,14 +141,14 @@ ERROR: ftp-error got expected ; parse-list ; : ftp-get ( filename ftp-client -- ftp-response ) - host>> open-remote-port binary + host>> open-remote-port binary drop swap [ ftp-retr 150 ftp-assert drop ] [ binary stream-copy ] 2bi read-response dup 226 ftp-assert ; : ftp-connect ( ftp-client -- stream ) - [ host>> ] [ port>> ] bi ascii ; + [ host>> ] [ port>> ] bi utf8 drop ; GENERIC: ftp-download ( path obj -- ) diff --git a/extra/ftp/ftp.factor b/extra/ftp/ftp.factor index ccdbcd76ea..b2b5ebc9aa 100644 --- a/extra/ftp/ftp.factor +++ b/extra/ftp/ftp.factor @@ -7,7 +7,8 @@ IN: ftp SINGLETON: active SINGLETON: passive -TUPLE: ftp-client host port user password mode state ; +TUPLE: ftp-client host port user password mode state +command-promise ; : ( host -- ftp-client ) ftp-client new diff --git a/extra/ftp/server/server.factor b/extra/ftp/server/server.factor index 37c806f1b9..beec25b7a5 100644 --- a/extra/ftp/server/server.factor +++ b/extra/ftp/server/server.factor @@ -1,19 +1,35 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors combinators io io.encodings.8-bit -io.files io.server io.sockets kernel math.parser -namespaces sequences ftp io.unix.launcher.parser -unicode.case splitting assocs ; +io.encodings io.encodings.binary io.encodings.utf8 io.files +io.server io.sockets kernel math.parser namespaces sequences +ftp io.unix.launcher.parser unicode.case splitting assocs +classes io.server destructors calendar io.timeouts +io.streams.duplex threads continuations +concurrency.promises byte-arrays ; IN: ftp.server SYMBOL: client -SYMBOL: stream TUPLE: ftp-command raw tokenized ; : ( -- obj ) ftp-command new ; +TUPLE: ftp-get path ; + +: ( path -- obj ) + ftp-get new swap >>path ; + +TUPLE: ftp-put path ; + +: ( path -- obj ) + ftp-put new swap >>path ; + +TUPLE: ftp-list ; + +C: ftp-list + : read-command ( -- ftp-command ) readln [ >>raw ] [ tokenize-command >>tokenized ] bi ; @@ -32,77 +48,179 @@ TUPLE: ftp-command raw tokenized ; swap >>n send-response ; +: ftp-error ( string -- ) + 500 "Unrecognized command: " rot append server-response ; + : send-banner ( -- ) 220 "Welcome to " host-name append server-response ; -: send-PASS-request ( -- ) - 331 "Please specify the password." server-response ; - : anonymous-only ( -- ) 530 "This FTP server is anonymous only." server-response ; -: parse-USER ( ftp-command -- ) - tokenized>> second client get swap >>user drop ; - -: send-login-response ( -- ) - ! client get - 230 "Login successful" server-response ; - -: parse-PASS ( ftp-command -- ) - tokenized>> second client get swap >>password drop ; - -: send-quit-response ( ftp-command -- ) +: handle-QUIT ( obj -- ) drop 221 "Goodbye." server-response ; -: ftp-error ( string -- ) - 500 "Unrecognized command: " rot append server-response ; +: handle-USER ( ftp-command -- ) + [ + tokenized>> second client get swap >>user drop + 331 "Please specify the password." server-response + ] [ + 2drop "bad USER" ftp-error + ] recover ; -: send-type-error ( -- ) - "TYPE is binary only" ftp-error ; +: handle-PASS ( ftp-command -- ) + [ + tokenized>> second client get swap >>password drop + 230 "Login successful" server-response + ] [ + 2drop "PASS error" ftp-error + ] recover ; -: send-type-success ( string -- ) - 200 "Switching to " rot " mode" 3append server-response ; +ERROR: type-error type ; -: parse-TYPE ( obj -- ) - tokenized>> second >upper { - { "IMAGE" [ "Binary" send-type-success ] } - { "I" [ "Binary" send-type-success ] } - [ drop send-type-error ] - } case ; +: handle-TYPE ( obj -- ) + [ + tokenized>> second >upper { + { "IMAGE" [ "Binary" ] } + { "I" [ "Binary" ] } + [ type-error ] + } case + 200 "Switching to " rot " mode" 3append server-response + ] [ + 2drop "TYPE is binary only" ftp-error + ] recover ; -: pwd-response ( -- ) +: handle-PWD ( obj -- ) + drop 257 current-directory get "\"" swap "\"" 3append server-response ; -! : random-local-inet ( -- spec ) - ! remote-address get class new 0 >>port ; - -! : handle-LIST ( -- ) - ! random-local-inet ascii ; +: random-local-server ( -- server ) + remote-address get class new 0 >>port binary ; : handle-STOR ( obj -- ) - ; + [ + drop + ] [ + 2drop + ] recover ; ! EPRT |2|::1|62138| ! : handle-EPRT ( obj -- ) ! tokenized>> second "|" split harvest ; -! : handle-EPSV ( obj -- ) - ! 229 "Entering Extended Passive Mode (|||" - ! random-local-inet ! get port number>string - ! "|)" 3append server-response ; - -! LPRT 6,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,242,186 -: handle-LPRT ( obj -- ) - tokenized>> "," split ; - : start-directory ( -- ) 150 "Here comes the directory listing." server-response ; : finish-directory ( -- ) 226 "Directory send OK." server-response ; -: send-directory-list ( stream -- ) - [ directory-list write ] with-output-stream ; +GENERIC: service-command ( stream obj -- ) + +M: ftp-list service-command ( stream obj -- ) + drop + start-directory + [ + utf8 encode-output + directory-list [ ftp-send ] each + ] with-output-stream + finish-directory ; + +: start-file-transfer ( path -- ) + 150 "Opening BINARY mode data connection for " + rot + [ file-name ] [ + " " swap file-info file-info-size number>string + "(" " bytes)." swapd 3append append + ] bi 3append server-response ; + +: finish-file-transfer ( -- ) + 226 "File send OK." server-response ; + +M: ftp-get service-command ( stream obj -- ) + [ + path>> + [ start-file-transfer ] + [ binary swap stream-copy ] bi + finish-file-transfer + ] [ + 3drop "File transfer failed" ftp-error + ] recover ; + +M: ftp-put service-command ( stream obj -- ) + [ + path>> + [ start-file-transfer ] + [ binary swap stream-copy ] bi + finish-file-transfer + ] [ + 3drop "File transfer failed" ftp-error + ] recover ; + +: extended-passive-loop ( server -- ) + [ + [ + |dispose + 30 seconds over set-timeout + accept drop &dispose + client get command-promise>> + 30 seconds ?promise-timeout + service-command + ] + [ client get f >>command-promise drop ] + [ ] cleanup + ] with-destructors ; + +: if-command-promise ( quot -- ) + >r client get command-promise>> r> + [ "Establish an active or passive connection first" ftp-error ] if* ; + +: handle-LIST ( obj -- ) + drop + [ swap fulfill ] if-command-promise ; + +: handle-SIZE ( obj -- ) + [ + tokenized>> second file-info size>> + 213 swap number>string server-response + ] [ + 2drop + 550 "Could not get file size" server-response + ] recover ; + +: handle-RETR ( obj -- ) + [ tokenized>> second swap fulfill ] + curry if-command-promise ; + +: handle-EPSV ( obj -- ) + drop + client get command-promise>> [ + "You already have a passive stream" ftp-error + ] [ + 229 "Entering Extended Passive Mode (|||" + random-local-server + client get >>command-promise drop + [ [ B extended-passive-loop ] curry in-thread ] + [ addr>> port>> number>string ] bi + "|)" 3append server-response + ] if ; + +! LPRT 6,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,242,186 +! : handle-LPRT ( obj -- ) tokenized>> "," split ; + +ERROR: not-a-directory ; + +: handle-CWD ( obj -- ) + [ + tokenized>> second dup directory? [ + set-current-directory + 250 "Directory successully changed." server-response + ] [ + not-a-directory throw + ] if + ] [ + 2drop + 550 "Failed to change directory." server-response + ] recover ; : unrecognized-command ( obj -- ) raw>> ftp-error ; @@ -111,28 +229,30 @@ TUPLE: ftp-command raw tokenized ; [ >>raw ] [ tokenize-command >>tokenized ] bi dup tokenized>> first >upper { - { "USER" [ parse-USER send-PASS-request t ] } - { "PASS" [ parse-PASS send-login-response t ] } + { "USER" [ handle-USER t ] } + { "PASS" [ handle-PASS t ] } { "ACCT" [ drop "ACCT unimplemented" ftp-error t ] } - ! { "CWD" [ ] } + { "CWD" [ handle-CWD t ] } + ! { "XCWD" [ ] } ! { "CDUP" [ ] } ! { "SMNT" [ ] } ! { "REIN" [ drop client get reset-ftp-client t ] } - { "QUIT" [ send-quit-response f ] } + { "QUIT" [ handle-QUIT f ] } ! { "PORT" [ ] } ! { "PASV" [ ] } ! { "MODE" [ ] } - { "TYPE" [ parse-TYPE t ] } + { "TYPE" [ handle-TYPE t ] } ! { "STRU" [ ] } ! { "ALLO" [ ] } ! { "REST" [ ] } ! { "STOR" [ handle-STOR t ] } ! { "STOU" [ ] } - ! { "RETR" [ ] } - ! { "LIST" [ drop handle-LIST t ] } + { "RETR" [ handle-RETR t ] } + { "LIST" [ handle-LIST t ] } + { "SIZE" [ handle-SIZE t ] } ! { "NLST" [ ] } ! { "APPE" [ ] } ! { "RNFR" [ ] } @@ -140,7 +260,7 @@ TUPLE: ftp-command raw tokenized ; ! { "DELE" [ ] } ! { "RMD" [ ] } ! { "MKD" [ ] } - { "PWD" [ drop pwd-response t ] } + { "PWD" [ handle-PWD t ] } ! { "ABOR" [ ] } ! { "SYST" [ drop ] } @@ -150,18 +270,20 @@ TUPLE: ftp-command raw tokenized ; ! { "SITE" [ ] } ! { "NOOP" [ ] } - ! { "EPRT" [ handle-eprt ] } - ! { "LPRT" [ handle-lprt ] } - ! { "EPSV" [ drop handle-epsv t ] } - ! { "LPSV" [ drop handle-lpsv t ] } + ! { "EPRT" [ handle-EPRT ] } + ! { "LPRT" [ handle-LPRT ] } + { "EPSV" [ handle-EPSV t ] } + ! { "LPSV" [ drop handle-LPSV t ] } [ drop unrecognized-command t ] } case [ handle-client-loop ] when ; : handle-client ( -- ) - "" [ - host-name client set - send-banner handle-client-loop - ] with-directory ; + [ + "" [ + host-name client set + send-banner handle-client-loop + ] with-directory + ] with-destructors ; : ftpd ( port -- ) internet-server "ftp.server" diff --git a/extra/globs/globs.factor b/extra/globs/globs.factor index 7204693016..4fa56bcf93 100755 --- a/extra/globs/globs.factor +++ b/extra/globs/globs.factor @@ -35,4 +35,4 @@ PRIVATE> : 'glob' just parse-1 just ; : glob-matches? ( input glob -- ? ) - >r >lower r> parse nil? not ; + [ >lower ] [ ] bi* parse nil? not ; diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor index 9a3ff8c7a7..42355f954e 100755 --- a/extra/html/parser/analyzer/analyzer.factor +++ b/extra/html/parser/analyzer/analyzer.factor @@ -1,8 +1,11 @@ USING: assocs html.parser kernel math sequences strings ascii arrays shuffle unicode.case namespaces splitting http -sequences.lib ; +sequences.lib accessors io combinators http.client ; IN: html.parser.analyzer +: scrape-html ( url -- vector ) + http-get parse-html ; + : (find-relative) [ >r + dup r> ?nth* [ 2drop f f ] unless ] [ 2drop f ] if ; @@ -41,8 +44,8 @@ IN: html.parser.analyzer : remove-blank-text ( vector -- vector' ) [ - dup tag-name text = [ - tag-text [ blank? ] all? not + dup name>> text = [ + text>> [ blank? ] all? not ] [ drop t ] if @@ -50,49 +53,50 @@ IN: html.parser.analyzer : trim-text ( vector -- vector' ) [ - dup tag-name text = [ - [ tag-text [ blank? ] trim ] keep + dup name>> text = [ + [ text>> [ blank? ] trim ] keep [ set-tag-text ] keep ] when ] map ; : find-by-id ( id vector -- vector ) - [ tag-attributes "id" swap at = ] with filter ; + [ attributes>> "id" swap at = ] with filter ; : find-by-class ( id vector -- vector ) - [ tag-attributes "class" swap at = ] with filter ; + [ attributes>> "class" swap at = ] with filter ; : find-by-name ( str vector -- vector ) >r >lower r> - [ tag-name = ] with filter ; + [ name>> = ] with filter ; : find-first-name ( str vector -- i/f tag/f ) >r >lower r> - [ tag-name = ] with find ; + [ name>> = ] with find ; : find-matching-close ( str vector -- i/f tag/f ) >r >lower r> - [ [ tag-name = ] keep tag-closing? and ] with find ; + [ [ name>> = ] keep closing?>> and ] with find ; : find-by-attribute-key ( key vector -- vector ) >r >lower r> - [ tag-attributes at ] with filter + [ attributes>> at ] with filter sift ; : find-by-attribute-key-value ( value key vector -- vector ) >r >lower r> - [ tag-attributes at over = ] with filter nip + [ attributes>> at over = ] with filter nip sift ; : find-first-attribute-key-value ( value key vector -- i/f tag/f ) >r >lower r> - [ tag-attributes at over = ] with find rot drop ; + [ attributes>> at over = ] with find rot drop ; : find-between* ( i/f tag/f vector -- vector ) pick integer? [ rot tail-slice - >r tag-name r> - [ find-matching-close drop 1+ ] keep swap head + >r name>> r> + [ find-matching-close drop dup [ 1+ ] when ] keep + swap [ head ] [ first ] if* ] [ 3drop V{ } clone ] if ; @@ -105,31 +109,63 @@ IN: html.parser.analyzer : find-between-first ( string vector -- vector' ) [ find-first-name ] keep find-between ; +: find-between-all ( vector quot -- seq ) + [ [ [ closing?>> not ] bi and ] curry find-all ] curry + [ [ >r first2 r> find-between* ] curry map ] bi ; + : tag-link ( tag -- link/f ) - tag-attributes [ "href" swap at ] [ f ] if* ; + attributes>> [ "href" swap at ] [ f ] if* ; -: find-links ( vector -- vector ) - [ tag-name "a" = ] filter - [ tag-link ] filter ; +: find-links ( vector -- vector' ) + [ [ name>> "a" = ] [ attributes>> "href" swap at ] bi and ] + find-between-all ; +: link. ( vector -- ) + [ second text>> write bl ] + [ first tag-link write nl ] bi ; : find-by-text ( seq quot -- tag ) - [ dup tag-name text = ] prepose find drop ; + [ dup name>> text = ] prepose find drop ; : find-opening-tags-by-name ( name seq -- seq ) - [ [ tag-name = ] keep tag-closing? not and ] with find-all ; + [ [ name>> = ] keep closing?>> not and ] with find-all ; : href-contains? ( str tag -- ? ) - tag-attributes "href" swap at* [ subseq? ] [ 2drop f ] if ; + attributes>> "href" swap at* [ subseq? ] [ 2drop f ] if ; + + +: find-forms ( vector -- vector' ) + "form" over find-opening-tags-by-name + over [ >r first2 r> find-between* ] curry map + [ [ name>> { "form" "input" } member? ] filter ] map ; + +: find-html-objects ( string vector -- vector' ) + find-opening-tags-by-name + over [ >r first2 r> find-between* ] curry map ; + +: form-action ( vector -- string ) + [ name>> "form" = ] find nip + attributes>> "action" swap at ; + +: hidden-form-values ( vector -- strings ) + [ attributes>> "type" swap at "hidden" = ] filter ; + +: input. ( tag -- ) + dup name>> print + attributes>> + [ bl bl bl bl [ write "=" write ] [ write bl ] bi* nl ] assoc-each ; + +: form. ( vector -- ) + [ closing?>> not ] filter + [ + { + { [ dup name>> "form" = ] + [ "form action: " write attributes>> "action" swap at print + ] } + { [ dup name>> "input" = ] [ input. ] } + [ drop ] + } cond + ] each ; : query>assoc* ( str -- hash ) "?" split1 nip query>assoc ; - -! clear "http://fark.com" http-get parse-html find-links [ "go.pl" swap start ] filter [ "=" split peek ] map - -! clear "http://www.sailwx.info/shiptrack/cruiseships.phtml" http-get parse-html remove-blank-text -! "a" over find-opening-tags-by-name -! [ nip "shipposition.phtml?call=GBTT" swap href-contains? ] assoc-filter -! first first 8 + over nth -! tag-attributes "href" swap at query>assoc* -! "lat" over at "lon" rot at diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor index bc4dc429fa..1ae5768f98 100644 --- a/extra/html/parser/parser.factor +++ b/extra/html/parser/parser.factor @@ -91,7 +91,7 @@ SYMBOL: tagstack read-dtd ] if ; -: read-tag ( -- ) +: read-tag ( -- string ) [ get-char CHAR: > = get-char CHAR: < = or ] take-until get-char CHAR: < = [ next* ] unless ; @@ -135,7 +135,7 @@ SYMBOL: tagstack (parse-tag) make-tag push-tag ] if ; -: (parse-html) ( tag -- ) +: (parse-html) ( -- ) get-next [ parse-text parse-tag diff --git a/extra/http/http-tests.factor b/extra/http/http-tests.factor index daac4d6dd9..89480b43ba 100755 --- a/extra/http/http-tests.factor +++ b/extra/http/http-tests.factor @@ -176,11 +176,11 @@ test-db [ main-responder set [ 1237 httpd ] "HTTPD test" spawn drop - - yield ] with-scope ] unit-test +[ ] [ 100 sleep ] unit-test + [ t ] [ "resource:extra/http/test/foo.html" ascii file-contents "http://localhost:1237/nested/foo.html" http-get = @@ -222,7 +222,7 @@ test-db [ ] with-scope ] unit-test -[ ] [ 1000 sleep ] unit-test +[ ] [ 100 sleep ] unit-test : 404? [ download-failed? ] [ response>> code>> 404 = ] bi and ; @@ -249,7 +249,7 @@ test-db [ ] with-scope ] unit-test -[ ] [ 1000 sleep ] unit-test +[ ] [ 100 sleep ] unit-test [ "Hi" ] [ "http://localhost:1237/" http-get ] unit-test diff --git a/extra/http/http.factor b/extra/http/http.factor index 6efbd42fd2..bc79424552 100755 --- a/extra/http/http.factor +++ b/extra/http/http.factor @@ -386,7 +386,7 @@ M: object protocol-addr drop [ host>> ] [ port>> ] bi ; M: https protocol-addr - call-next-method ; + call-next-method ; : request-addr ( request -- addr ) dup protocol>> protocol-addr ; diff --git a/extra/io/mmap/mmap-tests.factor b/extra/io/mmap/mmap-tests.factor index d25097e2b0..57faca01c7 100755 --- a/extra/io/mmap/mmap-tests.factor +++ b/extra/io/mmap/mmap-tests.factor @@ -8,8 +8,3 @@ IN: io.mmap.tests [ 5 ] [ "mmap-test-file.txt" temp-file dup file-info size>> [ length ] with-mapped-file ] unit-test [ "22345" ] [ "mmap-test-file.txt" temp-file ascii file-contents ] unit-test [ "mmap-test-file.txt" temp-file delete-file ] ignore-errors - -[ ] [ "a" "mmap-grow-test.txt" temp-file ascii set-file-contents ] unit-test -[ 1 ] [ "mmap-grow-test.txt" temp-file file-info size>> ] unit-test -[ ] [ "mmap-grow-test.txt" temp-file 100 [ drop ] with-mapped-file ] unit-test -[ 100 ] [ "mmap-grow-test.txt" temp-file file-info size>> ] unit-test diff --git a/extra/io/monitors/monitors-tests.factor b/extra/io/monitors/monitors-tests.factor old mode 100644 new mode 100755 index 3a4328a7b8..bd33954436 --- a/extra/io/monitors/monitors-tests.factor +++ b/extra/io/monitors/monitors-tests.factor @@ -1,7 +1,7 @@ IN: io.monitors.tests USING: io.monitors tools.test io.files system sequences continuations namespaces concurrency.count-downs kernel io -threads calendar prettyprint destructors ; +threads calendar prettyprint destructors io.timeouts ; os { winnt linux macosx } member? [ [ @@ -89,5 +89,23 @@ os { winnt linux macosx } member? [ ] with-monitors ! Out-of-scope disposal should not fail - [ "" resource-path t ] with-monitors dispose + [ ] [ [ "" resource-path f ] with-monitors dispose ] unit-test + [ ] [ [ "" resource-path t ] with-monitors dispose ] unit-test + + ! Timeouts + [ + [ ] [ "monitor-timeout-test" temp-file make-directories ] unit-test + + ! Non-recursive + [ ] [ "monitor-timeout-test" temp-file f "m" set ] unit-test + [ ] [ 3 seconds "m" get set-timeout ] unit-test + [ [ t ] [ "m" get next-change 2drop ] [ ] while ] must-fail + [ ] [ "m" get dispose ] unit-test + + ! Recursive + [ ] [ "monitor-timeout-test" temp-file t "m" set ] unit-test + [ ] [ 3 seconds "m" get set-timeout ] unit-test + [ [ t ] [ "m" get next-change 2drop ] [ ] while ] must-fail + [ ] [ "m" get dispose ] unit-test + ] with-monitors ] when diff --git a/extra/io/ports/ports-docs.factor b/extra/io/ports/ports-docs.factor index 0db8b01df5..7420cac115 100755 --- a/extra/io/ports/ports-docs.factor +++ b/extra/io/ports/ports-docs.factor @@ -22,7 +22,6 @@ $nl { $subsection init-stdio } { $subsection io-multiplex } "Per-port native I/O protocol:" -{ $subsection init-handle } { $subsection (wait-to-read) } { $subsection (wait-to-write) } "Additionally, the I/O backend must provide an implementation of the " { $link dispose } " generic word." ; @@ -30,15 +29,7 @@ $nl ABOUT: "io.ports" HELP: port -{ $class-description "Instances of this class present a blocking stream interface on top of an underlying non-blocking I/O system, giving the illusion of blocking by yielding the thread which is waiting for input or output." -$nl -"Ports have the following slots:" -{ $list - { { $snippet "handle" } " - a native handle identifying the underlying native resource used by the port" } - { { $snippet "error" } " - the most recent I/O error, if any. This error is thrown to the waiting thread when " { $link pending-error } " is called by stream operations" } - { { $snippet "type" } " - a symbol identifying the port's intended purpose" } - { { $snippet "eof" } " - a flag indicating if the port has reached the end of file while reading" } -} } ; +{ $class-description "Instances of this class present a blocking stream interface on top of an underlying non-blocking I/O system, giving the illusion of blocking by yielding the thread which is waiting for input or output." } ; HELP: input-port { $class-description "The class of ports implementing the input stream protocol." } ; @@ -46,10 +37,6 @@ HELP: input-port HELP: output-port { $class-description "The class of ports implementing the output stream protocol." } ; -HELP: init-handle -{ $values { "handle" "a native handle identifying an I/O resource" } } -{ $contract "Prepares a native handle for use by the port; called by " { $link } "." } ; - HELP: { $values { "handle" "a native handle identifying an I/O resource" } { "class" class } { "port" "a new " { $link port } } } { $description "Creates a new " { $link port } " with no buffer." } @@ -70,21 +57,13 @@ HELP: { $description "Creates a new " { $link output-port } " using the specified native handle and a default-sized input buffer." } $low-level-note ; -HELP: pending-error -{ $values { "port" port } } -{ $description "If an error occurred while the I/O thread was performing input or output on this port, this error will be thrown to the caller." } ; - HELP: (wait-to-read) { $values { "port" input-port } } { $contract "Suspends the current thread until the port's buffer has data available for reading." } ; HELP: wait-to-read -{ $values { "port" input-port } } -{ $description "If the port's buffer has unread data, returns immediately, otherwise suspends the current thread until some data is available for reading." } ; - -HELP: unless-eof -{ $values { "port" input-port } { "quot" "a quotation with stack effect " { $snippet "( port -- value )" } } { "value" object } } -{ $description "If the port has reached end of file, outputs " { $link f } ", otherwise applies the quotation to the port." } ; +{ $values { "port" input-port } { "eof?" "a boolean" } } +{ $description "If the port's buffer has unread data, returns immediately, otherwise suspends the current thread until some data is available for reading. If the buffer was empty and no more data could be read, outputs " { $link t } " to indicate end-of-file; otherwise outputs " { $link f } "." } ; HELP: can-write? { $values { "len" "a positive integer" } { "buffer" buffer } { "?" "a boolean" } } diff --git a/extra/io/ports/ports.factor b/extra/io/ports/ports.factor index 56455d7711..b82797354f 100755 --- a/extra/io/ports/ports.factor +++ b/extra/io/ports/ports.factor @@ -10,20 +10,14 @@ IN: io.ports SYMBOL: default-buffer-size 64 1024 * default-buffer-size set-global -TUPLE: port handle error timeout disposed ; +TUPLE: port handle timeout disposed ; M: port timeout timeout>> ; M: port set-timeout (>>timeout) ; -GENERIC: init-handle ( handle -- ) - : ( handle class -- port ) - new - swap dup init-handle >>handle ; inline - -: pending-error ( port -- ) - [ f ] change-error drop [ throw ] when* ; + new swap >>handle ; inline TUPLE: buffered-port < port buffer ; @@ -31,27 +25,24 @@ TUPLE: buffered-port < port buffer ; default-buffer-size get >>buffer ; inline -TUPLE: input-port < buffered-port eof ; +TUPLE: input-port < buffered-port ; : ( handle -- input-port ) input-port ; HOOK: (wait-to-read) io-backend ( port -- ) -: wait-to-read ( port -- ) - dup buffer>> buffer-empty? [ (wait-to-read) ] [ drop ] if ; - -: unless-eof ( port quot -- value ) - >r dup buffer>> buffer-empty? over eof>> and - [ f >>eof drop f ] r> if ; inline +: wait-to-read ( port -- eof? ) + dup buffer>> buffer-empty? [ + dup (wait-to-read) buffer>> buffer-empty? + ] [ drop f ] if ; M: input-port stream-read1 dup check-disposed - dup wait-to-read [ buffer>> buffer-pop ] unless-eof ; + dup wait-to-read [ drop f ] [ buffer>> buffer-pop ] if ; : read-step ( count port -- byte-array/f ) - [ wait-to-read ] keep - [ dupd buffer>> buffer-read ] unless-eof nip ; + dup wait-to-read [ 2drop f ] [ buffer>> buffer-read ] if ; M: input-port stream-read-partial ( max stream -- byte-array/f ) dup check-disposed @@ -109,15 +100,15 @@ M: output-port stream-write HOOK: (wait-to-write) io-backend ( port -- ) -: flush-port ( port -- ) - dup buffer>> buffer-empty? [ drop ] [ (wait-to-write) ] if ; +: port-flush ( port -- ) + dup buffer>> buffer-empty? + [ drop ] [ dup (wait-to-write) port-flush ] if ; M: output-port stream-flush ( port -- ) - dup check-disposed - [ flush-port ] [ pending-error ] bi ; + [ check-disposed ] [ port-flush ] bi ; M: output-port dispose* - [ flush-port ] [ call-next-method ] bi ; + [ port-flush ] [ call-next-method ] bi ; M: buffered-port dispose* [ call-next-method ] diff --git a/extra/io/server/server.factor b/extra/io/server/server.factor index 221a3301ce..359b9c6fb4 100755 --- a/extra/io/server/server.factor +++ b/extra/io/server/server.factor @@ -1,9 +1,10 @@ ! Copyright (C) 2003, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: io io.sockets io.files io.streams.duplex logging -continuations destructors kernel math math.parser namespaces -parser sequences strings prettyprint debugger quotations -calendar threads concurrency.combinators assocs fry ; +USING: io io.sockets io.sockets.secure io.files +io.streams.duplex logging continuations destructors kernel math +math.parser namespaces parser sequences strings prettyprint +debugger quotations calendar threads concurrency.combinators +assocs fry ; IN: io.server SYMBOL: servers @@ -41,6 +42,9 @@ PRIVATE> : internet-server ( port -- seq ) f swap t resolve-host ; +: secure-server ( port -- seq ) + internet-server [ ] map ; + : with-server ( seq service encoding quot -- ) V{ } clone servers [ '[ , [ , , server-loop ] with-logging ] parallel-each diff --git a/extra/io/sockets/secure/secure-tests.factor b/extra/io/sockets/secure/secure-tests.factor index a2287c28f7..9b9436a8db 100644 --- a/extra/io/sockets/secure/secure-tests.factor +++ b/extra/io/sockets/secure/secure-tests.factor @@ -1,5 +1 @@ -IN: io.sockets.secure.tests -USING: io.sockets.secure tools.test ; - -\ must-infer -{ 1 0 } [ [ ] with-ssl-context ] must-infer-as +! No unit tests here, until Windows SSL is implemented diff --git a/extra/io/sockets/secure/secure.factor b/extra/io/sockets/secure/secure.factor index d9ca85ddd6..22265b9069 100644 --- a/extra/io/sockets/secure/secure.factor +++ b/extra/io/sockets/secure/secure.factor @@ -1,38 +1,68 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel symbols namespaces continuations -destructors io.sockets sequences ; +destructors io.sockets sequences inspector ; IN: io.sockets.secure -SYMBOL: ssl-backend +SYMBOL: secure-socket-backend SINGLETONS: SSLv2 SSLv23 SSLv3 TLSv1 ; -TUPLE: ssl-config method key-file ca-file ca-path password ; +TUPLE: secure-config +method +key-file password +ca-file ca-path +dh-file +ephemeral-key-bits ; -: ( -- config ) - ssl-config new - SSLv23 >>method ; +: ( -- config ) + secure-config new + SSLv23 >>method + 512 >>ephemeral-key-bits ; -TUPLE: ssl-context config handle ; +TUPLE: secure-context config handle disposed ; -HOOK: ssl-backend ( config -- context ) +HOOK: secure-socket-backend ( config -- context ) -: with-ssl-context ( config quot -- ) +: with-secure-context ( config quot -- ) [ - [ ] [ [ ssl-context set ] prepose ] bi* + [ ] [ [ secure-context set ] prepose ] bi* with-disposal ] with-scope ; inline -TUPLE: ssl addrspec ; +TUPLE: secure addrspec ; -C: ssl +C: secure + +: resolve-secure-host ( host port passive? -- seq ) + resolve-host [ ] map ; + +HOOK: check-certificate secure-socket-backend ( host handle -- ) > inet? ; +PREDICATE: secure-inet < secure addrspec>> inet? ; -M: ssl-inet (client) - addrspec>> resolve-client-addr [ ] map (client) ; +M: secure-inet (client) + [ + addrspec>> + [ [ host>> ] [ port>> ] bi f resolve-secure-host (client) >r |dispose r> ] keep + host>> pick handle>> check-certificate + ] with-destructors ; PRIVATE> + +ERROR: premature-close ; + +M: premature-close summary + drop "Connection closed prematurely - potential truncation attack" ; + +ERROR: certificate-verify-error result ; + +M: certificate-verify-error summary + drop "Certificate verification failed" ; + +ERROR: common-name-verify-error expected got ; + +M: common-name-verify-error summary + drop "Common name verification failed" ; diff --git a/extra/io/sockets/sockets-docs.factor b/extra/io/sockets/sockets-docs.factor index 7ef08575c0..e7d68d6111 100755 --- a/extra/io/sockets/sockets-docs.factor +++ b/extra/io/sockets/sockets-docs.factor @@ -37,7 +37,7 @@ ARTICLE: "network-packet" "Packet-oriented networking" { $subsection receive } "Packet-oriented sockets are closed by calling " { $link dispose } "." $nl -"Address specifiers have the following interpretation with connection-oriented networking words:" +"Address specifiers have the following interpretation with packet-oriented networking words:" { $list { { $link local } " - Unix domain datagram sockets on Unix systems" } { { $link inet4 } " - a TCP/IP connection to an IPv4 address and port number; no name lookup is performed" } @@ -130,7 +130,7 @@ HELP: { $errors "Throws an error if the address is already in use, or if it if the system forbids access." } ; HELP: accept -{ $values { "server" "a handle" } { "client" "a bidirectional stream" } { "addrspec" "an address specifier" } } +{ $values { "server" "a handle" } { "client" "a bidirectional stream" } { "remote" "an address specifier" } } { $description "Waits for a connection to a server socket created by " { $link } ", and outputs a bidirectional stream when the connection has been established. The encoding of this stream is the one that was passed to the server constructor." } { $errors "Throws an error if the server socket is closed or otherwise is unavailable." } ; diff --git a/extra/io/sockets/sockets-tests.factor b/extra/io/sockets/sockets-tests.factor old mode 100644 new mode 100755 index b4dd910004..dfeb311312 --- a/extra/io/sockets/sockets-tests.factor +++ b/extra/io/sockets/sockets-tests.factor @@ -1,5 +1,6 @@ IN: io.sockets.tests -USING: io.sockets sequences math tools.test ; +USING: io.sockets sequences math tools.test namespaces accessors +kernel destructors calendar io.timeouts ; [ B{ 1 2 3 4 } ] [ "1.2.3.4" T{ inet4 } inet-pton ] unit-test @@ -44,3 +45,26 @@ USING: io.sockets sequences math tools.test ; [ B{ 0 1 0 2 0 0 0 0 0 0 0 0 0 3 0 4 } T{ inet6 } inet-ntop ] unit-test [ t ] [ "localhost" 80 f resolve-host length 1 >= ] unit-test + +! Smoke-test UDP +[ ] [ "127.0.0.1" 0 "datagram1" set ] unit-test +[ ] [ "datagram1" get addr>> "addr1" set ] unit-test +[ f ] [ "addr1" get port>> 0 = ] unit-test + +[ ] [ "127.0.0.1" 0 "datagram2" set ] unit-test +[ ] [ "datagram2" get addr>> "addr2" set ] unit-test +[ f ] [ "addr2" get port>> 0 = ] unit-test + +[ ] [ B{ 1 2 3 4 } "addr2" get "datagram1" get send ] unit-test +[ B{ 1 2 3 4 } ] [ "datagram2" get receive "from" set ] unit-test +[ ] [ B{ 4 3 2 1 } "from" get "datagram2" get send ] unit-test +[ B{ 4 3 2 1 } t ] [ "datagram1" get receive "addr2" get = ] unit-test + +[ ] [ "datagram1" get dispose ] unit-test +[ ] [ "datagram2" get dispose ] unit-test + +! Test timeouts +[ ] [ "127.0.0.1" 0 "datagram3" set ] unit-test + +[ ] [ 1 seconds "datagram3" get set-timeout ] unit-test +[ "datagram3" get receive ] must-fail diff --git a/extra/io/sockets/sockets.factor b/extra/io/sockets/sockets.factor index 36a0559bdb..93185f50f6 100755 --- a/extra/io/sockets/sockets.factor +++ b/extra/io/sockets/sockets.factor @@ -156,6 +156,11 @@ GENERIC: (get-local-address) ( handle remote -- sockaddr ) : get-local-address ( handle remote -- local ) [ (get-local-address) ] keep parse-sockaddr ; +GENERIC: (get-remote-address) ( handle remote -- sockaddr ) + +: get-remote-address ( handle local -- remote ) + [ (get-remote-address) ] keep parse-sockaddr ; + GENERIC: establish-connection ( client-out remote -- ) GENERIC: ((client)) ( remote -- handle ) @@ -180,7 +185,7 @@ M: object (client) ( remote -- client-in client-out local ) SYMBOL: local-address -: with-client ( addrspec encoding quot -- ) +: with-client ( remote encoding quot -- ) >r [ local-address set ] curry r> compose with-stream ; inline @@ -198,22 +203,26 @@ GENERIC: (server) ( addrspec -- handle ) [ drop server-port ] [ get-local-address ] 2bi >>addr r> >>encoding ; -GENERIC: (accept) ( server addrspec -- handle ) +GENERIC: (accept) ( server addrspec -- handle sockaddr ) : accept ( server -- client remote ) [ dup addr>> [ (accept) ] keep - [ drop dup ] [ get-local-address ] 2bi - -rot + parse-sockaddr swap + dup ] keep encoding>> swap ; TUPLE: datagram-port < port addr ; HOOK: (datagram) io-backend ( addr -- datagram ) -: ( addr -- datagram ) - dup (datagram) datagram-port swap >>addr ; +: ( addrspec -- datagram ) + [ + [ (datagram) |dispose ] keep + [ drop datagram-port ] [ get-local-address ] 2bi + >>addr + ] with-destructors ; : check-datagram-port ( port -- port ) dup check-disposed @@ -221,7 +230,7 @@ HOOK: (datagram) io-backend ( addr -- datagram ) HOOK: (receive) io-backend ( datagram -- packet addrspec ) -: receive ( datagram -- packet sockaddr ) +: receive ( datagram -- packet addrspec ) check-datagram-port [ (receive) ] [ addr>> ] bi parse-sockaddr ; @@ -278,11 +287,8 @@ TUPLE: inet host port ; C: inet -: resolve-client-addr ( inet -- seq ) - [ host>> ] [ port>> ] bi f resolve-host ; - M: inet (client) - resolve-client-addr (client) ; + [ host>> ] [ port>> ] bi f resolve-host (client) ; ERROR: invalid-inet-server addrspec ; diff --git a/extra/io/unix/backend/backend.factor b/extra/io/unix/backend/backend.factor old mode 100644 new mode 100755 index df5669d9aa..8f5b6c7540 --- a/extra/io/unix/backend/backend.factor +++ b/extra/io/unix/backend/backend.factor @@ -13,7 +13,15 @@ GENERIC: handle-fd ( handle -- fd ) TUPLE: fd fd disposed ; -: ( n -- fd ) f fd boa ; +: ( n -- fd ) + #! We drop the error code rather than calling io-error, + #! since on OS X 10.3, this operation fails from init-io + #! when running the Factor.app (presumably because fd 0 and + #! 1 are closed). + [ F_SETFL O_NONBLOCK fcntl drop ] + [ F_SETFD FD_CLOEXEC fcntl drop ] + [ f fd boa ] + tri ; M: fd dispose* fd>> close-file ; @@ -48,32 +56,24 @@ M: mx remove-output-callbacks writes>> delete-at* drop ; GENERIC: wait-for-events ( ms mx -- ) -TUPLE: unix-io-error error port ; - -: report-error ( error port -- ) - tuck unix-io-error boa >>error drop ; - : input-available ( fd mx -- ) remove-input-callbacks [ resume ] each ; : output-available ( fd mx -- ) remove-output-callbacks [ resume ] each ; -TUPLE: io-timeout ; - -M: io-timeout summary drop "I/O operation timed out" ; - M: unix cancel-io ( port -- ) - io-timeout new over report-error handle>> handle-fd mx get-global - [ input-available ] [ output-available ] 2bi ; + [ remove-input-callbacks [ t swap resume-with ] each ] + [ remove-output-callbacks [ t swap resume-with ] each ] + 2bi ; SYMBOL: +retry+ ! just try the operation again without blocking SYMBOL: +input+ SYMBOL: +output+ -: wait-for-fd ( handle event -- ) - dup +retry+ eq? [ 2drop ] [ +: wait-for-fd ( handle event -- timeout? ) + dup +retry+ eq? [ 2drop f ] [ [ >r swap handle-fd @@ -82,12 +82,18 @@ SYMBOL: +output+ { +input+ [ add-input-callback ] } { +output+ [ add-output-callback ] } } case - ] curry "I/O" suspend 2drop + ] curry "I/O" suspend nip ] if ; +ERROR: io-timeout ; + +M: io-timeout summary drop "I/O operation timed out" ; + : wait-for-port ( port event -- ) - [ >r dup handle>> r> wait-for-fd ] curry - with-timeout pending-error ; + [ + >r handle>> r> wait-for-fd + [ io-timeout ] when + ] curry with-timeout ; ! Some general stuff : file-mode OCT: 0666 ; @@ -101,19 +107,7 @@ SYMBOL: +output+ : io-error ( n -- ) 0 < [ (io-error) ] when ; -M: fd init-handle ( fd -- ) - #! We drop the error code rather than calling io-error, - #! since on OS X 10.3, this operation fails from init-io - #! when running the Factor.app (presumably because fd 0 and - #! 1 are closed). - fd>> - [ F_SETFL O_NONBLOCK fcntl drop ] - [ F_SETFD FD_CLOEXEC fcntl drop ] bi ; - ! Readers -: eof ( reader -- ) - dup buffer>> buffer-empty? [ t >>eof ] when drop ; - : (refill) ( port -- n ) [ handle>> ] [ buffer>> buffer-end ] @@ -126,8 +120,7 @@ GENERIC: refill ( port handle -- event/f ) M: fd refill fd>> over buffer>> [ buffer-end ] [ buffer-capacity ] bi read { - { [ dup 0 = ] [ drop eof f ] } - { [ dup 0 > ] [ swap buffer>> n>buffer f ] } + { [ dup 0 >= ] [ swap buffer>> n>buffer f ] } { [ err_no EINTR = ] [ 2drop +retry+ ] } { [ err_no EAGAIN = ] [ 2drop +input+ ] } [ (io-error) ] @@ -153,8 +146,7 @@ M: fd drain } cond ; M: unix (wait-to-write) ( port -- ) - dup dup handle>> drain dup - [ dupd wait-for-port (wait-to-write) ] [ 2drop ] if ; + dup dup handle>> drain dup [ wait-for-port ] [ 2drop ] if ; M: unix io-multiplex ( ms/f -- ) mx get-global wait-for-events ; @@ -172,7 +164,8 @@ TUPLE: mx-port < port mx ; : multiplexer-error ( n -- ) 0 < [ - err_no [ EAGAIN = ] [ EINTR = ] bi or [ (io-error) ] unless + err_no [ EAGAIN = ] [ EINTR = ] bi or + [ (io-error) ] unless ] when ; : ?flag ( n mask symbol -- n ) diff --git a/extra/io/unix/linux/monitors/monitors.factor b/extra/io/unix/linux/monitors/monitors.factor index 17d3041aaf..562e12699c 100644 --- a/extra/io/unix/linux/monitors/monitors.factor +++ b/extra/io/unix/linux/monitors/monitors.factor @@ -5,7 +5,7 @@ io.files io.buffers io.monitors io.ports io.timeouts io.unix.backend io.unix.select io.encodings.utf8 unix.linux.inotify assocs namespaces threads continuations init math math.bitfields sets alien alien.strings alien.c-types -vocabs.loader accessors system hashtables ; +vocabs.loader accessors system hashtables destructors ; IN: io.unix.linux.monitors SYMBOL: watches @@ -23,9 +23,9 @@ TUPLE: linux-monitor < monitor wd inotify watches disposed ; : wd>monitor ( wd -- monitor ) watches get at ; : ( -- port/f ) - inotify_init dup 0 < [ drop f ] [ ] if ; + inotify_init dup 0 < [ drop f ] [ ] if ; -: inotify-fd inotify get handle>> ; +: inotify-fd inotify get handle>> handle-fd ; : check-existing ( wd -- ) watches get key? [ @@ -57,8 +57,10 @@ M: linux (monitor) ( path recursive? mailbox -- monitor ) M: linux-monitor dispose* ( monitor -- ) [ [ wd>> ] [ watches>> ] bi delete-at ] [ - [ inotify>> handle>> ] [ wd>> ] bi - inotify_rm_watch io-error + dup inotify>> disposed>> [ drop ] [ + [ inotify>> handle>> handle-fd ] [ wd>> ] bi + inotify_rm_watch io-error + ] if ] bi ; : ignore-flags? ( mask -- ? ) @@ -108,7 +110,8 @@ M: linux-monitor dispose* ( monitor -- ) ] if ; : inotify-read-loop ( port -- ) - dup wait-to-read + dup check-disposed + dup wait-to-read drop 0 over buffer>> parse-file-notifications 0 over buffer>> buffer-reset inotify-read-loop ; diff --git a/extra/io/unix/pipes/pipes.factor b/extra/io/unix/pipes/pipes.factor index db2c917520..71366bfa4a 100644 --- a/extra/io/unix/pipes/pipes.factor +++ b/extra/io/unix/pipes/pipes.factor @@ -8,5 +8,4 @@ QUALIFIED: io.pipes M: unix io.pipes:(pipe) ( -- pair ) 2 "int" dup pipe io-error - 2 c-int-array> first2 [ ] bi@ - [ [ init-handle ] bi@ ] [ io.pipes:pipe boa ] 2bi ; + 2 c-int-array> first2 [ ] bi@ io.pipes:pipe boa ; diff --git a/extra/io/unix/sockets/secure/secure-tests.factor b/extra/io/unix/sockets/secure/secure-tests.factor new file mode 100644 index 0000000000..c68b497493 --- /dev/null +++ b/extra/io/unix/sockets/secure/secure-tests.factor @@ -0,0 +1,90 @@ +IN: io.sockets.secure.tests +USING: accessors kernel namespaces io io.sockets +io.sockets.secure io.encodings.ascii io.streams.duplex +classes words destructors threads tools.test +concurrency.promises byte-arrays ; + +\ must-infer +{ 1 0 } [ [ ] with-secure-context ] must-infer-as + +[ ] [ "port" set ] unit-test + +[ ] [ + [ + + "resource:extra/openssl/test/server.pem" >>key-file + "resource:extra/openssl/test/root.pem" >>ca-file + "resource:extra/openssl/test/dh1024.pem" >>dh-file + "password" >byte-array >>password + [ + "127.0.0.1" 0 ascii [ + dup addr>> addrspec>> port>> "port" get fulfill + accept [ + class word-name write + ] curry with-stream + ] with-disposal + ] with-secure-context + ] "SSL server test" spawn drop +] unit-test + +[ "secure" ] [ + [ + "127.0.0.1" "port" get ?promise ascii drop contents + ] with-secure-context +] unit-test + +! Now, see what happens if the server closes the connection prematurely +! [ ] [ "port" set ] unit-test +! +! [ ] [ +! [ +! +! "resource:extra/openssl/test/server.pem" >>key-file +! "resource:extra/openssl/test/root.pem" >>ca-file +! "resource:extra/openssl/test/dh1024.pem" >>dh-file +! "password" >byte-array >>password +! [ +! "127.0.0.1" 0 ascii [ +! dup addr>> addrspec>> port>> "port" get fulfill +! accept drop +! [ +! dup in>> stream>> handle>> f >>connected drop +! "hello" over stream-write dup stream-flush +! ] with-disposal +! ] with-disposal +! ] with-secure-context +! ] "SSL server test" spawn drop +! ] unit-test + +! [ +! [ +! "127.0.0.1" "port" get ?promise ascii drop contents +! ] with-secure-context +! ] [ \ premature-close = ] must-fail-with + +! Now, try validating the certificate. This should fail because its +! actually an invalid certificate +[ ] [ "port" set ] unit-test + +[ ] [ + [ + + "resource:extra/openssl/test/server.pem" >>key-file + "resource:extra/openssl/test/root.pem" >>ca-file + "resource:extra/openssl/test/dh1024.pem" >>dh-file + "password" >>password + [ + "127.0.0.1" 0 ascii [ + dup addr>> addrspec>> port>> "port" get fulfill + accept drop dispose + ] with-disposal + ] with-secure-context + ] "SSL server test" spawn drop +] unit-test + +[ + [ + "localhost" "port" get ?promise ascii + drop dispose + ] with-secure-context +] [ certificate-verify-error? ] must-fail-with diff --git a/extra/io/unix/sockets/secure/secure.factor b/extra/io/unix/sockets/secure/secure.factor old mode 100644 new mode 100755 index b4381de43b..9feeb90690 --- a/extra/io/unix/sockets/secure/secure.factor +++ b/extra/io/unix/sockets/secure/secure.factor @@ -6,7 +6,7 @@ continuations destructors openssl openssl.libcrypto openssl.libssl io.files io.ports io.unix.backend io.unix.sockets io.encodings.ascii io.buffers io.sockets io.sockets.secure -unix system ; +unix system inspector ; IN: io.unix.sockets.secure M: ssl-handle handle-fd file>> handle-fd ; @@ -16,7 +16,7 @@ M: ssl-handle handle-fd file>> handle-fd ; drop { { -1 [ (io-error) ] } - { 0 [ "Premature EOF" throw ] } + { 0 [ premature-close ] } } case ] [ nip (ssl-error) @@ -30,7 +30,7 @@ M: ssl-handle handle-fd file>> handle-fd ; check-response { { SSL_ERROR_NONE [ swap buffer>> n>buffer f ] } - { SSL_ERROR_ZERO_RETURN [ drop eof f ] } + { SSL_ERROR_ZERO_RETURN [ 2drop f ] } { SSL_ERROR_WANT_READ [ 2drop +input+ ] } { SSL_ERROR_WANT_WRITE [ 2drop +output+ ] } { SSL_ERROR_SYSCALL [ syscall-error ] } @@ -69,12 +69,12 @@ M: ssl-handle drain [ fd>> BIO_NOCLOSE BIO_new_socket dup ssl-error ] keep [ handle>> swap dup SSL_set_bio ] keep ; -M: ssl ((client)) ( addrspec -- handle ) +M: secure ((client)) ( addrspec -- handle ) addrspec>> ((client)) ; -M: ssl parse-sockaddr addrspec>> parse-sockaddr ; +M: secure parse-sockaddr addrspec>> parse-sockaddr ; -M: ssl (get-local-address) addrspec>> (get-local-address) ; +M: secure (get-local-address) addrspec>> (get-local-address) ; : check-connect-response ( port r -- event ) check-response @@ -91,13 +91,13 @@ M: ssl (get-local-address) addrspec>> (get-local-address) ; check-connect-response dup [ dupd wait-for-port do-ssl-connect ] [ 2drop ] if ; -M: ssl establish-connection ( client-out remote -- ) +M: secure establish-connection ( client-out remote -- ) [ addrspec>> establish-connection ] [ drop do-ssl-connect ] [ drop handle>> t >>connected drop ] 2tri ; -M: ssl (server) addrspec>> (server) ; +M: secure (server) addrspec>> (server) ; : check-accept-response ( handle r -- event ) over handle>> over SSL_get_error @@ -111,12 +111,13 @@ M: ssl (server) addrspec>> (server) ; : do-ssl-accept ( ssl-handle -- ) dup dup handle>> SSL_accept check-accept-response dup - [ >r dup file>> r> wait-for-fd do-ssl-accept ] [ 2drop ] if ; + [ >r dup file>> r> wait-for-fd drop do-ssl-accept ] [ 2drop ] if ; -M: ssl (accept) +M: secure (accept) [ - addrspec>> (accept) |dispose |dispose - dup do-ssl-accept + addrspec>> (accept) >r + |dispose t >>connected |dispose + dup do-ssl-accept r> ] with-destructors ; : check-shutdown-response ( handle r -- event ) @@ -124,14 +125,15 @@ M: ssl (accept) { { 1 [ drop f ] } { 0 [ - dup SSL_want { - { SSL_NOTHING [ dup SSL_shutdown check-shutdown-response ] } + dup handle>> SSL_want + { + { SSL_NOTHING [ dup handle>> SSL_shutdown check-shutdown-response ] } { SSL_READING [ drop +input+ ] } { SSL_WRITING [ drop +output+ ] } } case ] } { -1 [ - -1 SSL_get_error + handle>> -1 SSL_get_error { { SSL_ERROR_WANT_READ [ +input+ ] } { SSL_ERROR_WANT_WRITE [ +output+ ] } @@ -143,6 +145,6 @@ M: ssl (accept) M: unix ssl-shutdown dup connected>> [ - dup handle>> dup SSL_shutdown check-shutdown-response - dup [ dupd wait-for-fd ssl-shutdown ] [ 2drop ] if + dup dup handle>> SSL_shutdown check-shutdown-response + dup [ dupd wait-for-fd drop ssl-shutdown ] [ 2drop ] if ] [ drop ] if ; diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor index 0bb0e3405a..d4059c102a 100755 --- a/extra/io/unix/sockets/sockets.factor +++ b/extra/io/unix/sockets/sockets.factor @@ -13,7 +13,7 @@ EXCLUDE: io.sockets => accept ; IN: io.unix.sockets : socket-fd ( domain type -- fd ) - 0 socket dup io-error |dispose dup init-handle ; + 0 socket dup io-error |dispose ; : set-socket-option ( fd level opt -- ) >r >r handle-fd r> r> 1 "int" heap-size setsockopt io-error ; @@ -26,6 +26,10 @@ M: object (get-local-address) ( handle remote -- sockaddr ) >r handle-fd r> empty-sockaddr/size [ getsockname io-error ] 2keep drop ; +M: object (get-remote-address) ( handle local -- sockaddr ) + >r handle-fd r> empty-sockaddr/size + [ getpeername io-error ] 2keep drop ; + : init-client-socket ( fd -- ) SOL_SOCKET SO_OOBINLINE set-socket-option ; @@ -66,16 +70,17 @@ M: object (server) ( addrspec -- handle ) dup handle-fd 10 listen io-error ] with-destructors ; -: do-accept ( server addrspec -- fd ) - [ handle>> handle-fd ] [ empty-sockaddr/size ] bi* accept ; inline +: do-accept ( server addrspec -- fd sockaddr ) + [ handle>> handle-fd ] [ empty-sockaddr/size ] bi* + [ accept ] 2keep drop ; inline -M: object (accept) ( server addrspec -- fd ) +M: object (accept) ( server addrspec -- fd sockaddr ) 2dup do-accept { - { [ dup 0 >= ] [ 2nip ] } - { [ err_no EINTR = ] [ drop (accept) ] } + { [ over 0 >= ] [ >r 2nip r> ] } + { [ err_no EINTR = ] [ 2drop (accept) ] } { [ err_no EAGAIN = ] [ - drop + 2drop [ drop +input+ wait-for-port ] [ (accept) ] 2bi diff --git a/extra/io/windows/mmap/mmap-tests.factor b/extra/io/windows/mmap/mmap-tests.factor new file mode 100644 index 0000000000..a8430108e8 --- /dev/null +++ b/extra/io/windows/mmap/mmap-tests.factor @@ -0,0 +1,8 @@ +USING: io io.mmap io.files kernel tools.test continuations +sequences io.encodings.ascii accessors ; +IN: io.windows.mmap.tests + +[ ] [ "a" "mmap-grow-test.txt" temp-file ascii set-file-contents ] unit-test +[ 1 ] [ "mmap-grow-test.txt" temp-file file-info size>> ] unit-test +[ ] [ "mmap-grow-test.txt" temp-file 100 [ [ ] change-each ] with-mapped-file ] unit-test +[ 100 ] [ "mmap-grow-test.txt" temp-file file-info size>> ] unit-test diff --git a/extra/io/windows/nt/backend/backend.factor b/extra/io/windows/nt/backend/backend.factor index 134a0c024a..5cc0751c55 100755 --- a/extra/io/windows/nt/backend/backend.factor +++ b/extra/io/windows/nt/backend/backend.factor @@ -8,7 +8,8 @@ accessors locals ; QUALIFIED: windows.winsock IN: io.windows.nt.backend -SYMBOL: io-hash +! Global variable with assoc mapping overlapped to threads +SYMBOL: pending-overlapped TUPLE: io-callback port thread ; @@ -33,62 +34,41 @@ M: winnt add-completion ( win32-handle -- ) handle>> master-completion-port get-global drop ; : eof? ( error -- ? ) - dup ERROR_HANDLE_EOF = swap ERROR_BROKEN_PIPE = or ; - -: overlapped-error? ( port n -- ? ) - zero? [ - GetLastError { - { [ dup expected-io-error? ] [ 2drop t ] } - { [ dup eof? ] [ drop t >>eof drop f ] } - [ (win32-error-string) throw ] - } cond - ] [ - drop t - ] if ; - -: get-overlapped-result ( overlapped port -- bytes-transferred ) - dup handle>> handle>> rot 0 - [ 0 GetOverlappedResult overlapped-error? drop ] keep *uint ; - -: save-callback ( overlapped port -- ) - [ - swap - dup alien? [ "bad overlapped in save-callback" throw ] unless - io-hash get-global set-at - ] "I/O" suspend 3drop ; + [ ERROR_HANDLE_EOF = ] [ ERROR_BROKEN_PIPE = ] bi or ; : twiddle-thumbs ( overlapped port -- bytes-transferred ) - [ save-callback ] - [ get-overlapped-result ] - [ nip pending-error ] - 2tri ; - -:: wait-for-overlapped ( ms -- overlapped ? ) - master-completion-port get-global - 0 ! bytes - f ! key - f ! overlapped [ - ms INFINITE or ! timeout - GetQueuedCompletionStatus - ] keep *void* swap zero? ; + drop + [ pending-overlapped get-global set-at ] curry "I/O" suspend + { + { [ dup integer? ] [ ] } + { [ dup array? ] [ + first dup eof? + [ drop 0 ] [ (win32-error-string) throw ] if + ] } + } cond + ] with-timeout ; -: lookup-callback ( overlapped -- callback ) - io-hash get-global delete-at* drop - dup io-callback? [ "no callback in io-hash" throw ] unless ; +:: wait-for-overlapped ( ms -- bytes-transferred overlapped error? ) + master-completion-port get-global + 0 [ ! bytes + f ! key + f [ ! overlapped + ms INFINITE or ! timeout + GetQueuedCompletionStatus zero? + ] keep *void* + ] keep *int spin ; + +: resume-callback ( result overlapped -- ) + pending-overlapped get-global delete-at* drop resume-with ; : handle-overlapped ( timeout -- ? ) wait-for-overlapped [ - GetLastError dup expected-io-error? [ 2drop f ] [ - >r lookup-callback [ thread>> ] [ port>> ] bi r> - dup eof? - [ drop t >>eof ] - [ (win32-error-string) >>error ] if drop - resume t - ] if + >r drop GetLastError + [ 1array ] [ expected-io-error? ] bi + [ r> 2drop f ] [ r> resume-callback t ] if ] [ - lookup-callback - thread>> resume t + resume-callback t ] if ; M: winnt cancel-io @@ -99,44 +79,43 @@ M: winnt io-multiplex ( ms -- ) M: winnt init-io ( -- ) master-completion-port set-global - H{ } clone io-hash set-global + H{ } clone pending-overlapped set-global windows.winsock:init-winsock ; +: file-error? ( n -- eof? ) + zero? [ + GetLastError { + { [ dup expected-io-error? ] [ drop f ] } + { [ dup eof? ] [ drop t ] } + [ (win32-error-string) throw ] + } cond + ] [ f ] if ; + +: wait-for-file ( FileArgs n port -- n ) + swap file-error? + [ 2drop 0 ] [ >r lpOverlapped>> r> twiddle-thumbs ] if ; + : update-file-ptr ( n port -- ) handle>> dup ptr>> [ rot + >>ptr drop ] [ 2drop ] if* ; -: finish-flush ( n port -- ) +: finish-write ( n port -- ) [ update-file-ptr ] [ buffer>> buffer-consume ] 2bi ; -: ((wait-to-write)) ( port -- ) - dup make-FileArgs - tuck setup-write WriteFile - dupd overlapped-error? [ - >r lpOverlapped>> r> - [ twiddle-thumbs ] keep - [ finish-flush ] keep - dup buffer>> buffer-empty? [ drop ] [ ((wait-to-write)) ] if - ] [ - 2drop - ] if ; - M: winnt (wait-to-write) - [ [ ((wait-to-write)) ] with-timeout ] with-destructors ; + [ + [ make-FileArgs dup setup-write WriteFile ] + [ wait-for-file ] + [ finish-write ] + tri + ] with-destructors ; : finish-read ( n port -- ) - over zero? [ - t >>eof 2drop - ] [ - [ buffer>> n>buffer ] [ update-file-ptr ] 2bi - ] if ; - -: ((wait-to-read)) ( port -- ) - dup make-FileArgs - tuck setup-read ReadFile - dupd overlapped-error? [ - >r lpOverlapped>> r> - [ twiddle-thumbs ] [ finish-read ] bi - ] [ 2drop ] if ; + [ update-file-ptr ] [ buffer>> n>buffer ] 2bi ; M: winnt (wait-to-read) ( port -- ) - [ [ ((wait-to-read)) ] with-timeout ] with-destructors ; + [ + [ make-FileArgs dup setup-read ReadFile ] + [ wait-for-file ] + [ finish-read ] + tri + ] with-destructors ; diff --git a/extra/io/windows/nt/monitors/monitors.factor b/extra/io/windows/nt/monitors/monitors.factor index a509d1d5e7..fa4d19a46e 100755 --- a/extra/io/windows/nt/monitors/monitors.factor +++ b/extra/io/windows/nt/monitors/monitors.factor @@ -35,7 +35,7 @@ TUPLE: win32-monitor < monitor port ; (make-overlapped) [ f ReadDirectoryChangesW win32-error=0/f ] keep ; -: read-changes ( port -- bytes ) +: read-changes ( port -- bytes-transferred ) [ [ begin-reading-changes ] [ twiddle-thumbs ] bi ] with-destructors ; diff --git a/extra/io/windows/nt/sockets/sockets.factor b/extra/io/windows/nt/sockets/sockets.factor index 75a08a02c4..a31c41942f 100755 --- a/extra/io/windows/nt/sockets/sockets.factor +++ b/extra/io/windows/nt/sockets/sockets.factor @@ -82,17 +82,27 @@ TUPLE: AcceptEx-args port AcceptEx-args >tuple*< AcceptEx drop winsock-error-string [ throw ] when* ; -M: object (accept) ( server addr -- handle ) +: extract-remote-address ( AcceptEx -- sockaddr ) + { + [ lpOutputBuffer*>> ] + [ dwReceiveDataLength*>> ] + [ dwLocalAddressLength*>> ] + [ dwRemoteAddressLength*>> ] + } cleave + f + 0 + f + [ 0 GetAcceptExSockaddrs ] keep *void* ; + +M: object (accept) ( server addr -- handle sockaddr ) [ - [ - - { - [ call-AcceptEx ] - [ wait-for-socket drop ] - [ sAcceptSocket*>> opened-socket ] - [ port>> pending-error ] - } cleave - ] curry with-timeout + + { + [ call-AcceptEx ] + [ wait-for-socket drop ] + [ sAcceptSocket*>> ] + [ extract-remote-address ] + } cleave ] with-destructors ; TUPLE: WSARecvFrom-args port @@ -121,17 +131,16 @@ TUPLE: WSARecvFrom-args port WSARecvFrom-args >tuple*< WSARecvFrom socket-error* ; : parse-WSARecvFrom ( n WSARecvFrom -- packet sockaddr ) - [ lpBuffers*>> WSABUF-buf swap memory>byte-array ] [ lpFrom*>> ] bi ; + [ lpBuffers*>> WSABUF-buf swap memory>byte-array ] + [ [ lpFrom*>> ] [ lpFromLen*>> *int ] bi memory>byte-array ] bi ; M: winnt (receive) ( datagram -- packet addrspec ) [ - { - [ call-WSARecvFrom ] - [ wait-for-socket ] - [ port>> pending-error ] - [ parse-WSARecvFrom ] - } cleave + [ call-WSARecvFrom ] + [ wait-for-socket ] + [ parse-WSARecvFrom ] + tri ] with-destructors ; TUPLE: WSASendTo-args port @@ -166,6 +175,5 @@ M: winnt (send) ( packet addrspec datagram -- ) [ call-WSASendTo ] [ wait-for-socket drop ] - [ port>> pending-error ] - tri + bi ] with-destructors ; diff --git a/extra/io/windows/sockets/sockets.factor b/extra/io/windows/sockets/sockets.factor index 67d827aa95..359776d639 100755 --- a/extra/io/windows/sockets/sockets.factor +++ b/extra/io/windows/sockets/sockets.factor @@ -30,6 +30,10 @@ M: object (get-local-address) ( socket addrspec -- sockaddr ) >r handle>> r> empty-sockaddr/size [ getsockname socket-error ] 2keep drop ; +M: object (get-remote-address) ( socket addrspec -- sockaddr ) + >r handle>> r> empty-sockaddr/size + [ getpeername socket-error ] 2keep drop ; + : bind-socket ( win32-socket sockaddr len -- ) >r >r handle>> r> r> bind socket-error ; diff --git a/extra/io/windows/windows.factor b/extra/io/windows/windows.factor index 6b6b54ab92..30b72f3e2f 100755 --- a/extra/io/windows/windows.factor +++ b/extra/io/windows/windows.factor @@ -24,9 +24,6 @@ TUPLE: win32-file < win32-handle ptr ; : ( handle -- win32-file ) win32-file new-win32-handle ; -M: win32-file init-handle ( handle -- ) - drop ; - HOOK: CreateFile-flags io-backend ( DWORD -- DWORD ) HOOK: FileArgs-overlapped io-backend ( port -- overlapped/f ) HOOK: add-completion io-backend ( port -- ) diff --git a/extra/openal/openal.factor b/extra/openal/openal.factor index c0a79d8353..38d61a8823 100644 --- a/extra/openal/openal.factor +++ b/extra/openal/openal.factor @@ -235,13 +235,13 @@ SYMBOL: init : init-openal ( -- ) init get-global expired? [ - f f alutInit drop + f f alutInit 0 = [ "Could not initialize OpenAL" throw ] when 1337 init set-global ] when ; : exit-openal ( -- ) init get-global expired? [ - alutExit drop + alutExit 0 = [ "Could not close OpenAL" throw ] when f init set-global ] unless ; diff --git a/extra/openssl/libssl/libssl.factor b/extra/openssl/libssl/libssl.factor index 42ccac2312..f5680972f3 100755 --- a/extra/openssl/libssl/libssl.factor +++ b/extra/openssl/libssl/libssl.factor @@ -5,7 +5,8 @@ ! ! export LD_LIBRARY_PATH=/opt/local/lib -USING: alien alien.syntax combinators kernel system ; +USING: alien alien.syntax combinators kernel system namespaces +assocs parser sequences words quotations ; IN: openssl.libssl @@ -176,6 +177,12 @@ FUNCTION: void SSL_CTX_set_tmp_rsa_callback ( ssl-ctx ctx, void* rsa ) ; FUNCTION: void* BIO_f_ssl ( ) ; +: SSL_CTX_set_tmp_rsa ( ctx rsa -- n ) + >r SSL_CTRL_SET_TMP_RSA 0 r> SSL_CTX_ctrl ; + +: SSL_CTX_set_tmp_dh ( ctx dh -- n ) + >r SSL_CTRL_SET_TMP_DH 0 r> SSL_CTX_ctrl ; + ! =============================================== ! x509.h ! =============================================== @@ -191,47 +198,63 @@ FUNCTION: X509_NAME* X509_get_subject_name ( X509* a ) ; ! x509_vfy.h ! =============================================== -: X509_V_OK 0 ; inline -: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT 2 ; inline -: X509_V_ERR_UNABLE_TO_GET_CRL 3 ; inline -: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE 4 ; inline -: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE 5 ; inline -: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY 6 ; inline -: X509_V_ERR_CERT_SIGNATURE_FAILURE 7 ; inline -: X509_V_ERR_CRL_SIGNATURE_FAILURE 8 ; inline -: X509_V_ERR_CERT_NOT_YET_VALID 9 ; inline -: X509_V_ERR_CERT_HAS_EXPIRED 10 ; inline -: X509_V_ERR_CRL_NOT_YET_VALID 11 ; inline -: X509_V_ERR_CRL_HAS_EXPIRED 12 ; inline -: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD 13 ; inline -: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD 14 ; inline -: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD 15 ; inline -: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD 16 ; inline -: X509_V_ERR_OUT_OF_MEM 17 ; inline -: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT 18 ; inline -: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN 19 ; inline -: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY 20 ; inline -: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE 21 ; inline -: X509_V_ERR_CERT_CHAIN_TOO_LONG 22 ; inline -: X509_V_ERR_CERT_REVOKED 23 ; inline -: X509_V_ERR_INVALID_CA 24 ; inline -: X509_V_ERR_PATH_LENGTH_EXCEEDED 25 ; inline -: X509_V_ERR_INVALID_PURPOSE 26 ; inline -: X509_V_ERR_CERT_UNTRUSTED 27 ; inline -: X509_V_ERR_CERT_REJECTED 28 ; inline -: X509_V_ERR_SUBJECT_ISSUER_MISMATCH 29 ; inline -: X509_V_ERR_AKID_SKID_MISMATCH 30 ; inline -: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH 31 ; inline -: X509_V_ERR_KEYUSAGE_NO_CERTSIGN 32 ; inline -: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER 33 ; inline -: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION 34 ; inline -: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN 35 ; inline -: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION 36 ; inline -: X509_V_ERR_INVALID_NON_CA 37 ; inline -: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED 38 ; inline -: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE 39 ; inline -: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED 40 ; inline -: X509_V_ERR_APPLICATION_VERIFICATION 50 ; inline +<< + +SYMBOL: verify-messages + +H{ } clone verify-messages set-global + +: verify-message ( n -- word ) verify-messages get-global at ; + +: X509_V_: + scan "X509_V_" prepend create-in + scan-word + [ 1quotation define-inline ] + [ verify-messages get set-at ] 2bi ; parsing + +>> + +X509_V_: OK 0 +X509_V_: ERR_UNABLE_TO_GET_ISSUER_CERT 2 +X509_V_: ERR_UNABLE_TO_GET_CRL 3 +X509_V_: ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE 4 +X509_V_: ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE 5 +X509_V_: ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY 6 +X509_V_: ERR_CERT_SIGNATURE_FAILURE 7 +X509_V_: ERR_CRL_SIGNATURE_FAILURE 8 +X509_V_: ERR_CERT_NOT_YET_VALID 9 +X509_V_: ERR_CERT_HAS_EXPIRED 10 +X509_V_: ERR_CRL_NOT_YET_VALID 11 +X509_V_: ERR_CRL_HAS_EXPIRED 12 +X509_V_: ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD 13 +X509_V_: ERR_ERROR_IN_CERT_NOT_AFTER_FIELD 14 +X509_V_: ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD 15 +X509_V_: ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD 16 +X509_V_: ERR_OUT_OF_MEM 17 +X509_V_: ERR_DEPTH_ZERO_SELF_SIGNED_CERT 18 +X509_V_: ERR_SELF_SIGNED_CERT_IN_CHAIN 19 +X509_V_: ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY 20 +X509_V_: ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE 21 +X509_V_: ERR_CERT_CHAIN_TOO_LONG 22 +X509_V_: ERR_CERT_REVOKED 23 +X509_V_: ERR_INVALID_CA 24 +X509_V_: ERR_PATH_LENGTH_EXCEEDED 25 +X509_V_: ERR_INVALID_PURPOSE 26 +X509_V_: ERR_CERT_UNTRUSTED 27 +X509_V_: ERR_CERT_REJECTED 28 +X509_V_: ERR_SUBJECT_ISSUER_MISMATCH 29 +X509_V_: ERR_AKID_SKID_MISMATCH 30 +X509_V_: ERR_AKID_ISSUER_SERIAL_MISMATCH 31 +X509_V_: ERR_KEYUSAGE_NO_CERTSIGN 32 +X509_V_: ERR_UNABLE_TO_GET_CRL_ISSUER 33 +X509_V_: ERR_UNHANDLED_CRITICAL_EXTENSION 34 +X509_V_: ERR_KEYUSAGE_NO_CRL_SIGN 35 +X509_V_: ERR_UNHANDLED_CRITICAL_CRL_EXTENSION 36 +X509_V_: ERR_INVALID_NON_CA 37 +X509_V_: ERR_PROXY_PATH_LENGTH_EXCEEDED 38 +X509_V_: ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE 39 +X509_V_: ERR_PROXY_CERTIFICATES_NOT_ALLOWED 40 +X509_V_: ERR_APPLICATION_VERIFICATION 50 ! =============================================== ! obj_mac.h diff --git a/extra/openssl/openssl-tests.factor b/extra/openssl/openssl-tests.factor index d06340d518..5990153073 100755 --- a/extra/openssl/openssl-tests.factor +++ b/extra/openssl/openssl-tests.factor @@ -1,20 +1,21 @@ USING: io.sockets.secure io.encodings.ascii alien.strings openssl namespaces accessors tools.test continuations kernel ; -openssl ssl-backend [ +openssl secure-socket-backend [ [ ] [ - + "resource:extra/openssl/test/server.pem" >>key-file "resource:extra/openssl/test/root.pem" >>ca-file - "password" ascii string>alien >>password - [ ] with-ssl-context + "resource:extra/openssl/test/dh1024.pem" >>dh-file + "password" >>password + [ ] with-secure-context ] unit-test [ - + "resource:extra/openssl/test/server.pem" >>key-file "resource:extra/openssl/test/root.pem" >>ca-file - "wrong password" ascii string>alien >>password - [ ] with-ssl-context + "wrong password" >>password + [ ] with-secure-context ] must-fail ] with-variable diff --git a/extra/openssl/openssl.factor b/extra/openssl/openssl.factor index 014592dbcc..a7ba2eab0f 100755 --- a/extra/openssl/openssl.factor +++ b/extra/openssl/openssl.factor @@ -5,7 +5,7 @@ math.order combinators init alien alien.c-types alien.strings libc continuations destructors debugger inspector locals unicode.case openssl.libcrypto openssl.libssl -io.backend io.ports io.files io.encodings.ascii io.sockets.secure ; +io.backend io.ports io.files io.encodings.8-bit io.sockets.secure ; IN: openssl ! This code is based on http://www.rtfm.com/openssl-examples/ @@ -47,7 +47,7 @@ SYMBOL: ssl-initiazed? [ f ssl-initiazed? set-global ] "openssl" add-init-hook -TUPLE: openssl-context < ssl-context aliens ; +TUPLE: openssl-context < secure-context aliens ; : load-certificate-chain ( ctx -- ) dup config>> key-file>> [ @@ -68,7 +68,7 @@ TUPLE: openssl-context < ssl-context aliens ; ] alien-callback ; : default-pasword ( ctx -- alien ) - [ config>> password>> malloc-byte-array ] [ aliens>> ] bi + [ config>> password>> latin1 malloc-string ] [ aliens>> ] bi [ push ] [ drop ] 2bi ; : set-default-password ( ctx -- ) @@ -99,25 +99,57 @@ TUPLE: openssl-context < ssl-context aliens ; : set-verify-depth ( ctx -- ) handle>> 1 SSL_CTX_set_verify_depth ; -M: openssl ( config -- context ) +TUPLE: bio handle disposed ; + +: f bio boa ; + +M: bio dispose* handle>> BIO_free ssl-error ; + +: ( path -- bio ) + normalize-path "r" BIO_new_file dup ssl-error ; + +: load-dh-params ( ctx -- ) + dup config>> dh-file>> [ + [ handle>> ] [ config>> dh-file>> ] bi &dispose + handle>> f f f PEM_read_bio_DHparams dup ssl-error + SSL_CTX_set_tmp_dh ssl-error + ] [ drop ] if ; + +TUPLE: rsa handle disposed ; + +: f rsa boa ; + +M: rsa dispose* handle>> RSA_free ; + +: generate-eph-rsa-key ( ctx -- ) + [ handle>> ] + [ + config>> ephemeral-key-bits>> RSA_F4 f f RSA_generate_key + dup ssl-error &dispose handle>> + ] bi + SSL_CTX_set_tmp_rsa ssl-error ; + +M: openssl ( config -- context ) maybe-init-ssl [ dup method>> ssl-method SSL_CTX_new - dup ssl-error V{ } clone openssl-context boa |dispose + dup ssl-error f V{ } clone openssl-context boa |dispose { [ load-certificate-chain ] [ set-default-password ] [ use-private-key-file ] [ load-verify-locations ] [ set-verify-depth ] + [ load-dh-params ] + [ generate-eph-rsa-key ] [ ] } cleave ] with-destructors ; -M: openssl-context dispose - dup aliens>> [ free ] each f >>aliens - dup handle>> [ SSL_CTX_free ] when* f >>handle - drop ; +M: openssl-context dispose* + [ aliens>> [ free ] each ] + [ handle>> SSL_CTX_free ] + bi ; TUPLE: ssl-handle file handle connected disposed ; @@ -127,14 +159,12 @@ M: no-ssl-context summary drop "SSL operations must be wrapped in calls to with-ssl-context" ; : current-ssl-context ( -- ctx ) - ssl-context get [ no-ssl-context ] unless* ; + secure-context get [ no-ssl-context ] unless* ; : ( fd -- ssl ) current-ssl-context handle>> SSL_new dup ssl-error f f ssl-handle boa ; -M: ssl-handle init-handle file>> init-handle ; - HOOK: ssl-shutdown io-backend ( handle -- ) M: ssl-handle dispose* @@ -143,28 +173,24 @@ M: ssl-handle dispose* [ file>> dispose ] tri ; -ERROR: certificate-verify-error result ; - : check-verify-result ( ssl-handle -- ) SSL_get_verify_result dup X509_V_OK = - [ certificate-verify-error ] [ drop ] if ; + [ drop ] [ verify-message certificate-verify-error ] if ; : common-name ( certificate -- host ) X509_get_subject_name NID_commonName 256 [ 256 X509_NAME_get_text_by_NID ] keep - swap -1 = [ drop f ] [ ascii alien>string ] if ; - -ERROR: common-name-verify-error expected got ; + swap -1 = [ drop f ] [ latin1 alien>string ] if ; : check-common-name ( host ssl-handle -- ) SSL_get_peer_certificate common-name 2dup [ >lower ] bi@ = [ 2drop ] [ common-name-verify-error ] if ; -: check-certificate ( host ssl -- ) +M: openssl check-certificate ( host ssl -- ) handle>> [ nip check-verify-result ] [ check-common-name ] 2bi ; -openssl ssl-backend set-global +openssl secure-socket-backend set-global diff --git a/extra/shell/parser/parser.factor b/extra/shell/parser/parser.factor index 46548bb34f..2ecca6199c 100644 --- a/extra/shell/parser/parser.factor +++ b/extra/shell/parser/parser.factor @@ -23,8 +23,8 @@ TUPLE: factor-expr expr ; pipeline-expr new over [ 1st ] [ 4th [ 1st ] map ] [ 5th ] tri suffix prefix-on >>commands over 2nd >>stdin - over 5th >>stdout - swap 6th >>background ; + over 6th >>stdout + swap 7th >>background ; : ast>single-quoted-expr ( ast -- obj ) 2nd >string single-quoted-expr boa ; diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor index 7f30104e21..8ba5b66d5a 100644 --- a/extra/shell/shell.factor +++ b/extra/shell/shell.factor @@ -1,7 +1,7 @@ USING: kernel parser words continuations namespaces debugger sequences combinators splitting prettyprint - system io io.files io.launcher io.encodings.utf8 sequences.deep + system io io.files io.launcher io.encodings.utf8 io.pipes sequences.deep accessors multi-methods newfx shell.parser ; IN: shell @@ -95,8 +95,7 @@ METHOD: expand { object } ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: pipeline-chant ( pipeline-chant -- ) - drop "ix: pipelines not supported" print ; +: pipeline-chant ( pipeline-chant -- ) commands>> run-pipeline drop ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/unix/unix.factor b/extra/unix/unix.factor index 9a7d405546..7d846b9bef 100755 --- a/extra/unix/unix.factor +++ b/extra/unix/unix.factor @@ -26,6 +26,8 @@ TYPEDEF: uint socklen_t : ESRCH 3 ; inline : EEXIST 17 ; inline +: NGROUPS_MAX 16 ; inline + C-STRUCT: group { "char*" "gr_name" } { "char*" "gr_passwd" } @@ -120,6 +122,7 @@ FUNCTION: void* mmap ( void* addr, size_t len, int prot, int flags, int fd, off_ FUNCTION: int munmap ( void* addr, size_t len ) ; FUNCTION: uint ntohl ( uint n ) ; FUNCTION: ushort ntohs ( ushort n ) ; +FUNCTION: int shutdown ( int fd, int how ) ; FUNCTION: int open ( char* path, int flags, int prot ) ; diff --git a/extra/windows/winsock/winsock.factor b/extra/windows/winsock/winsock.factor index 0699afc682..57181d2704 100755 --- a/extra/windows/winsock/winsock.factor +++ b/extra/windows/winsock/winsock.factor @@ -168,6 +168,7 @@ FUNCTION: int send ( SOCKET s, char* buf, int len, int flags ) ; FUNCTION: int recv ( SOCKET s, char* buf, int len, int flags ) ; FUNCTION: int getsockname ( SOCKET s, sockaddr_in* address, int* addrlen ) ; +FUNCTION: int getpeername ( SOCKET s, sockaddr_in* address, int* addrlen ) ; TYPEDEF: uint SERVICETYPE TYPEDEF: OVERLAPPED WSAOVERLAPPED