FEAT: HTTPD server now have ON-ACCEPT actor which can be used to limit connection to specified IPs only

Oldes · Oldes · commit ead47c08bc8a · 2019-04-02T17:50:23.000+02:00
diff --git a/src/modules/httpd.r3 b/src/modules/httpd.r3
@@ -20,7 +20,6 @@ Rebol [
 	TODO: {
 		* support for multidomain serving using `Host` header field
 		* add support for other methods - PUT, DELETE, TRACE, CONNECT, OPTIONS?
-		* limit connections per IP
 		* better error handling
 		* standard access log
 		* add list-dir action which shows content of a directory, if allowed
@@ -117,6 +116,7 @@ sys/make-scheme [
 			close port/locals/subport
 		]
 
+		On-Accept: func [ctx [object!]][ true ]
 		On-Header: func [ctx [object!]][] ;= placeholder; user can use it for early request processing
 
 		On-Get: func [
@@ -495,8 +495,14 @@ sys/make-scheme [
 
 	New-Client: func[port [port!] /local client info err][
 		client: first port
-		client/awake: :Awake-Client
 		info: query client
+		unless Actor/On-Accept info [
+			; connection not allowed
+			sys/log/info 'HTTPD ["Client not accepted:^[[22m" info/remote-ip]
+			close client
+			return false
+		]
+		client/awake: :Awake-Client
 		client/locals: make object! [
 			state: none
 			parent: port
diff --git a/src/tests/httpd-root/form.html b/src/tests/httpd-root/form.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <h1>Just  a simple test form</h1>
-<form action="form.html" method="post">
+<form action="/result/" method="post">
   First name: <input type="text" name="fname"><br>
   Last name: <input type="text" name="lname"><br>
   <input type="submit" value="Submit">
diff --git a/src/tests/test-httpd.r3 b/src/tests/test-httpd.r3
@@ -19,6 +19,11 @@ do %../modules/httpd.r3
 system/options/log/httpd: 3 ; for verbose output
 
 my-actor: object [
+	On-Accept: func [info [object!]][
+		; allow only connections from localhost
+		; TRUE = accepted, FALSE = refuse
+		find [ 127.0.0.1 ] info/remote-ip 
+	]
 	On-Header: func [ctx [object!]][
 		switch ctx/inp/target/file [
 			%form/     [
@@ -34,7 +39,6 @@ my-actor: object [
 				; request processing will stop with redirection response
 			]
 		]
-		? ctx
 	]
 	On-Post-Received: func [ctx [object!]][
 		ctx/out/header/Content-Type: "text/html; charset=UTF-8"

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@ do %../modules/httpd.r3`
`19`	`19`	`system/options/log/httpd: 3 ; for verbose output`
`20`	`20`
`21`	`21`	`my-actor: object [`
	`22`	`+ On-Accept: func [info [object!]][`
	`23`	`+ ; allow only connections from localhost`
	`24`	`+ ; TRUE = accepted, FALSE = refuse`
	`25`	`+ find [ 127.0.0.1 ] info/remote-ip`
	`26`	`+ ]`
`22`	`27`	`On-Header: func [ctx [object!]][`
`23`	`28`	`switch ctx/inp/target/file [`
`24`	`29`	`%form/ [`
`@@ -34,7 +39,6 @@ my-actor: object [`
`34`	`39`	`; request processing will stop with redirection response`
`35`	`40`	`]`
`36`	`41`	`]`
`37`		`- ? ctx`
`38`	`42`	`]`
`39`	`43`	`On-Post-Received: func [ctx [object!]][`
`40`	`44`	`ctx/out/header/Content-Type: "text/html; charset=UTF-8"`