Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions frankenphp.c
Original file line number Diff line number Diff line change
Expand Up @@ -954,16 +954,12 @@ static int frankenphp_send_headers(sapi_headers_struct *sapi_headers) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
}

int status;

if (SG(sapi_headers).http_status_line) {
status = atoi((SG(sapi_headers).http_status_line) + 9);
} else {
status = SG(sapi_headers).http_response_code;

if (!status) {
status = 200;
}
/* Use the response code PHP already parsed; reparsing http_status_line with
* a fixed +9 offset read out of bounds for lines shorter than 9 bytes, e.g.
* header("HTTP/"). */
int status = SG(sapi_headers).http_response_code;
if (!status) {
status = 200;
}

bool success = go_write_headers(frankenphp_thread_index(), status,
Expand Down
45 changes: 45 additions & 0 deletions statusline_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package frankenphp_test

import (
"net/http"
"net/http/httptest"
"os"
"testing"

"github.com/dunglas/frankenphp"
"github.com/stretchr/testify/require"
)

func serveStatusScript(t *testing.T, script string) *http.Response {
t.Helper()

cwd, _ := os.Getwd()
req := httptest.NewRequest(http.MethodGet, "http://example.com/"+script, nil)
fr, err := frankenphp.NewRequestWithContext(req,
frankenphp.WithRequestDocumentRoot(cwd+"/testdata/", false))
require.NoError(t, err)

w := httptest.NewRecorder()
require.NoError(t, frankenphp.ServeHTTP(w, fr))

return w.Result()
}

// A status line shorter than 9 bytes (e.g. header("HTTP/")) once made
// frankenphp_send_headers read out of bounds via atoi(http_status_line + 9).
// Run under -asan to catch a regression.
func TestShortStatusLineDoesNotOverflow(t *testing.T) {
require.NoError(t, frankenphp.Init())
defer frankenphp.Shutdown()

resp := serveStatusScript(t, "short-status-line.php")
require.Equal(t, http.StatusOK, resp.StatusCode)
}

func TestCustomStatusLineIsHonored(t *testing.T) {
require.NoError(t, frankenphp.Init())
defer frankenphp.Shutdown()

resp := serveStatusScript(t, "custom-status-line.php")
require.Equal(t, http.StatusTeapot, resp.StatusCode)
}
4 changes: 4 additions & 0 deletions testdata/custom-status-line.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php

header('HTTP/1.1 418 I am a teapot');
echo 'ok';
5 changes: 5 additions & 0 deletions testdata/short-status-line.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

// A status line shorter than 9 bytes must not crash header dispatch.
header('HTTP/');
echo 'ok';
Loading