diff options
| author | Juan J. Martinez <jjm@usebox.net> | 2021-09-01 21:14:35 +0100 |
|---|---|---|
| committer | Juan J. Martinez <jjm@usebox.net> | 2021-09-01 21:14:35 +0100 |
| commit | cfbb8d48a22bd8c905b5e247c52a949d73c363be (patch) | |
| tree | 9dd863be5d129cb1cc47731462963391b665196f /server/src/net/usebox/gemini | |
| parent | 05b5bb6b77877cf8165d85560d5dec145a9369e1 (diff) | |
| download | spacebeans-cfbb8d48a22bd8c905b5e247c52a949d73c363be.tar.gz spacebeans-cfbb8d48a22bd8c905b5e247c52a949d73c363be.zip | |
FIX: index file can be a CGI and should be executed
Diffstat (limited to 'server/src/net/usebox/gemini')
| -rw-r--r-- | server/src/net/usebox/gemini/server/Response.scala | 2 | ||||
| -rw-r--r-- | server/src/net/usebox/gemini/server/Server.scala | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/server/src/net/usebox/gemini/server/Response.scala b/server/src/net/usebox/gemini/server/Response.scala index edb6cdc..1c2071f 100644 --- a/server/src/net/usebox/gemini/server/Response.scala +++ b/server/src/net/usebox/gemini/server/Response.scala @@ -115,6 +115,8 @@ case class Cgi( "REMOTE_HOST" -> remoteAddr ).toSeq + logger.debug(s"CGI env: $env") + val (status: Int, meta: String, body: String) = { val output = new java.io.ByteArrayOutputStream Try { diff --git a/server/src/net/usebox/gemini/server/Server.scala b/server/src/net/usebox/gemini/server/Server.scala index f402191..a14d829 100644 --- a/server/src/net/usebox/gemini/server/Server.scala +++ b/server/src/net/usebox/gemini/server/Server.scala @@ -104,12 +104,16 @@ case class Server(conf: ServiceConf) { .getDefault() .getPath(root, path) .normalize() - val cgi = vhost.getCgi(resource) + val cgi = vhost + .getCgi(resource) match { + case None => vhost.getCgi(resource.resolve(vhost.indexFile)) + case cgi => cgi + } logger.debug(s"requesting: '$resource', cgi is '$cgi'") resource.toFile() match { - case file + case _ if cgi .map(_.toFile()) .map(f => f.isFile() && f.canExecute()) @@ -120,7 +124,7 @@ case class Server(conf: ServiceConf) { val queryString = if (uri.getQuery() == null) "" else uri.getQuery() val pathInfo = - if (cgiFile.compareTo(resource) == 0) "" + if (cgiFile.compareTo(resource) >= 0) "" else "/" + resource .subpath( |