hanez/fun
1
0
Fork 0
forked from fun/fun
Code Pull requests Activity

Added GET and POST support to HTTPServer class. (0.37.32)

Browse source
This commit is contained in:
Johannes Findeisen 2025-12-29 17:24:08 +01:00
commit 83281bf2de
4 changed files with 92 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(fun VERSION 0.37.31 LANGUAGES C) project(fun VERSION 0.37.32 LANGUAGES C)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD_REQUIRED ON)

30
examples/data/htdocs/info.fun
View file

@ -9,6 +9,8 @@
* Added: 2025-12-28 * Added: 2025-12-28
*/ */
#include <strings.fun>
print("<!doctype html><html><body>") print("<!doctype html><html><body>")
print("<h1>Fun Environment Information</h1>") print("<h1>Fun Environment Information</h1>")
print("<p><strong>Current Path:</strong> " + env("PATH") + "</p>") print("<p><strong>Current Path:</strong> " + env("PATH") + "</p>")
@ -25,4 +27,32 @@ while i < len(all_keys)
print("<li>" + key + "=" + all_env[key] + "</li>") print("<li>" + key + "=" + all_env[key] + "</li>")
i = i + 1 i = i + 1
print("</ul>") print("</ul>")
print("<h2>GET Variables:</h2>")
print("<ul>")
qs = env("QUERY_STRING")
if (len(qs) > 0)
params = str_split(qs, "&")
i = 0
while i < len(params)
kv = str_split(params[i], "=")
if (len(kv) == 2)
print("<li>" + kv[0] + " = " + kv[1] + "</li>")
else
print("<li>" + params[i] + "</li>")
i = i + 1
print("</ul>")
print("<h2>POST Variables:</h2>")
print("<ul>")
pd = env("POST_DATA")
if (len(pd) > 0)
params = str_split(pd, "&")
i = 0
while i < len(params)
kv = str_split(params[i], "=")
if (len(kv) == 2)
print("<li>" + kv[0] + " = " + kv[1] + "</li>")
else
print("<li>" + params[i] + "</li>")
i = i + 1
print("</ul>")
print("</body></html>") print("</body></html>")

32
examples/extra/http_server_test.fun Executable file
View file

@ -0,0 +1,32 @@
#include <io/socket.fun>
c = TcpClient()
if (c.connect("127.0.0.1", 8080))
print("Connecting to server...")
// Test GET
print("Testing GET...")
c.send("GET /info.fun?foo=bar&baz=qux HTTP/1.1\r\nHost: localhost\r\n\r\n")
resp = c.recv_all(4096)
print("GET Response contains foo=bar: " + to_string(find(resp, "foo = bar") >= 0))
print("GET Response contains baz=qux: " + to_string(find(resp, "baz = qux") >= 0))
c.close()
else
print("Failed to connect to server")
if (c.connect("127.0.0.1", 8080))
// Test POST
print("Testing POST...")
body = "postfoo=postbar&postbaz=postqux"
req = "POST /info.fun HTTP/1.1\r\n"
req = req + "Host: localhost\r\n"
req = req + "Content-Length: " + to_string(len(body)) + "\r\n"
req = req + "\r\n"
req = req + body
c.send(req)
resp = c.recv_all(4096)
print("POST Response contains postfoo=postbar: " + to_string(find(resp, "postfoo = postbar") >= 0))
print("POST Response contains postbaz=postqux: " + to_string(find(resp, "postbaz = postqux") >= 0))
c.close()
else
print("Failed to connect to server for POST")

34
lib/net/http_server.fun
View file

@ -51,20 +51,44 @@ class HTTPServer(number port)
sock_close(fd) sock_close(fd)
return 0 return 0
method = parts[0] method = str_trim(parts[0])
path = parts[1] full_path = str_trim(parts[1])
path = full_path
query_string = ""
q_pos = find(full_path, "?")
if (q_pos >= 0)
path = substr(full_path, 0, q_pos)
query_string = substr(full_path, q_pos + 1, len(full_path) - q_pos - 1)
if (path == "/") if (path == "/")
path = "/index.html" path = "/index.html"
full_path = this.htdocs + path file_path = this.htdocs + path
post_data = ""
if (method == "POST")
// Find the end of headers (marked by \r\n\r\n or \n\n)
header_end = find(request, "\r\n\r\n")
if (header_end >= 0)
post_data = substr(request, header_end + 4, len(request) - header_end - 4)
else
header_end = find(request, "\n\n")
if (header_end >= 0)
post_data = substr(request, header_end + 2, len(request) - header_end - 2)
content = "" content = ""
if (str_ends_with(path, ".fun")) if (str_ends_with(path, ".fun"))
res = proc_run("fun" + " " + full_path) env_vars = ""
if (len(query_string) > 0)
env_vars = "QUERY_STRING='" + query_string + "' "
if (len(post_data) > 0)
env_vars = env_vars + "POST_DATA='" + post_data + "' "
res = proc_run(env_vars + " " + "fun" + " " + file_path)
content = res["out"] content = res["out"]
else else
content = read_file(full_path) content = read_file(file_path)
if (len(content) > 0) if (len(content) > 0)
this.send_response(fd, 200, "OK", content) this.send_response(fd, 200, "OK", content)