diff options
author | Juan J. Martinez <jjm@usebox.net> | 2022-01-02 22:18:57 +0000 |
---|---|---|
committer | Juan J. Martinez <jjm@usebox.net> | 2022-01-02 22:24:48 +0000 |
commit | 21f8ae5db73be083340bb65b4e1ab7ec3abb41b7 (patch) | |
tree | b3421907d2133b06d0800a1c6dc0c6a47abff64d /server/test | |
parent | b5b419ad0a89b36e136f4509a59a145f991e833d (diff) | |
download | spacebeans-21f8ae5db73be083340bb65b4e1ab7ec3abb41b7.tar.gz spacebeans-21f8ae5db73be083340bb65b4e1ab7ec3abb41b7.zip |
Resolve CGI directories from more to less specific
Closes issue #2.
Diffstat (limited to 'server/test')
-rwxr-xr-x | server/test/resources/dir/sub/cgiOk | 4 | ||||
-rw-r--r-- | server/test/src/ServerSpec.scala | 39 |
2 files changed, 43 insertions, 0 deletions
diff --git a/server/test/resources/dir/sub/cgiOk b/server/test/resources/dir/sub/cgiOk new file mode 100755 index 0000000..05a3e53 --- /dev/null +++ b/server/test/resources/dir/sub/cgiOk @@ -0,0 +1,4 @@ +#!/bin/bash + +echo -e "20 text/gemini\r\n" +env diff --git a/server/test/src/ServerSpec.scala b/server/test/src/ServerSpec.scala index dd6bf20..7d8c1fa 100644 --- a/server/test/src/ServerSpec.scala +++ b/server/test/src/ServerSpec.scala @@ -692,6 +692,21 @@ class ServerSpec extends AnyFlatSpec with Matchers { cgi.body should include("PATH_INFO=/path/info") } + it should "resolve CGI directories from more to less specific" in { + // issue: https://gitlab.com/reidrac/spacebeans/-/issues/2 + val cgi = Server(TestData.cgiPrefConf) + .handleReq( + "gemini://localhost/dir/sub/cgiOk/path/info", + "127.0.0.1" + ) + .asInstanceOf[Cgi] + + cgi.status should be(20) + cgi.meta should be("text/gemini") + cgi.body should include("GATEWAY_INTERFACE=CGI/1.1") + cgi.body should include("PATH_INFO=/path/info") + } + object TestData { val host = "localhost" @@ -733,6 +748,30 @@ class ServerSpec extends AnyFlatSpec with Matchers { ) ) + val cgiPrefConf = ServiceConf.initConf( + conf.copy(virtualHosts = + List( + conf + .virtualHosts(0) + .copy( + directoryListing = true, + directories = List( + Directory( + "dir/", + directoryListing = Some(false), + allowCgi = Some(true) + ), + Directory( + "dir/sub/", + directoryListing = Some(false), + allowCgi = Some(true) + ) + ) + ) + ) + ) + ) + val cgiEnvConf = cgiConf.copy(virtualHosts = List( cgiConf |