From a6bd4cba833bd576c20ca05badc3aa26ce7f0f91 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Tue, 31 Aug 2021 22:57:23 +0100 Subject: Support to pass env variables to CGIs Env variables are configured per virtual host. --- server/test/src/ServerSpec.scala | 65 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'server/test') diff --git a/server/test/src/ServerSpec.scala b/server/test/src/ServerSpec.scala index 7a2b501..bd909ca 100644 --- a/server/test/src/ServerSpec.scala +++ b/server/test/src/ServerSpec.scala @@ -455,6 +455,7 @@ class ServerSpec extends AnyFlatSpec with Matchers { "cgi", TestData.host, TestData.portStr, + _, _ ) => } @@ -473,6 +474,7 @@ class ServerSpec extends AnyFlatSpec with Matchers { "cgi", TestData.host, TestData.portStr, + _, _ ) => } @@ -491,6 +493,7 @@ class ServerSpec extends AnyFlatSpec with Matchers { "cgi", TestData.host, TestData.portStr, + _, _ ) => } @@ -509,6 +512,7 @@ class ServerSpec extends AnyFlatSpec with Matchers { "cgi", TestData.host, TestData.portStr, + _, _ ) => } @@ -566,6 +570,57 @@ class ServerSpec extends AnyFlatSpec with Matchers { bad.body should include(meta) } + it should "enviroment variables are optional" in { + Server(TestData.cgiConf).handleReq( + "gemini://localhost/dir/cgi/", + "127.0.0.1" + ) should matchPattern { + case Cgi( + _, + _, + _, + _, + "cgi", + TestData.host, + TestData.portStr, + _, + m + ) if m == Map() => + } + } + + it should "pass enviroment variables to the CGI" in { + Server(TestData.cgiEnvConf).handleReq( + "gemini://localhost/dir/cgi/", + "127.0.0.1" + ) should matchPattern { + case Cgi( + _, + _, + _, + _, + "cgi", + TestData.host, + TestData.portStr, + _, + m + ) if m == Map("env1" -> "value") => + } + } + + it should "execute a CGI with the environment variables" in { + val cgi = Server(TestData.cgiEnvConf) + .handleReq( + "gemini://localhost/dir/cgi", + "127.0.0.1" + ) + .asInstanceOf[Cgi] + + cgi.status should be(20) + cgi.meta should be("text/gemini") + cgi.body should include("env1=value") + } + object TestData { val host = "localhost" @@ -607,6 +662,16 @@ class ServerSpec extends AnyFlatSpec with Matchers { ) ) + val cgiEnvConf = cgiConf.copy(virtualHosts = + List( + cgiConf + .virtualHosts(0) + .copy( + environment = Some(Map("env1" -> "value")) + ) + ) + ) + val confUserDir = conf.copy(virtualHosts = List( conf -- cgit v1.2.3