Skip to content

CORS/Auth improvements #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2025
Merged

CORS/Auth improvements #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a92f3
CORS/Auth improvements
Jul 24, 2025
ed17c53
Allow all headers
lmangani Jul 24, 2025
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
29 changes: 14 additions & 15 deletions src/httpserver_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,17 @@ static std::string ConvertResultToXML(MaterializedQueryResult &result) {
void HandleHttpRequest(const duckdb_httplib_openssl::Request& req, duckdb_httplib_openssl::Response& res) {
std::string query;

// Check authentication
if (!IsAuthenticated(req)) {
res.status = 401;
res.set_content("Unauthorized", "text/plain");
return;
}

// CORS allow
// CORS allow - set these headers for all requests
res.set_header("Access-Control-Allow-Origin", "*");
res.set_header("Access-Control-Allow-Methods", "GET, POST, OPTIONS, PUT");
res.set_header("Access-Control-Allow-Headers", "*");
res.set_header("Access-Control-Allow-Credentials", "true");
res.set_header("Access-Control-Max-Age", "86400");

// Handle preflight OPTIONS request
if (req.method == "OPTIONS") {
res.status = 204; // No content
// Check authentication for actual requests (OPTIONS are handled separately)
if (!IsAuthenticated(req)) {
res.status = 401;
res.set_content("Unauthorized", "text/plain");
return;
}

Expand Down Expand Up @@ -344,15 +338,16 @@ void HttpServerStart(DatabaseInstance& db, string_t host, int32_t port, string_t
}
}

// CORS Preflight
// CORS Preflight - no authentication required for OPTIONS requests
global_state.server->Options(base_path,
[](const duckdb_httplib_openssl::Request& /*req*/, duckdb_httplib_openssl::Response& res) {
res.set_header("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
res.set_header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT");
res.set_header("Content-Type", "text/html; charset=utf-8");
res.set_header("Access-Control-Allow-Headers", "*");
res.set_header("Access-Control-Allow-Origin", "*");
res.set_header("Access-Control-Allow-Credentials", "true");
res.set_header("Connection", "close");
res.status = 204; // No content for preflight
return duckdb_httplib_openssl::Server::HandlerResponse::Handled;
});

Expand All @@ -363,9 +358,13 @@ void HttpServerStart(DatabaseInstance& db, string_t host, int32_t port, string_t
global_state.server->Get(base_path, HandleHttpRequest);
global_state.server->Post(base_path, HandleHttpRequest);

// Health check endpoint
// Health check endpoint, now relative to base_path
// Health check endpoint - no authentication required
global_state.server->Get(base_path + "ping", [](const duckdb_httplib_openssl::Request& req, duckdb_httplib_openssl::Response& res) {
// Set CORS headers for health check endpoint
res.set_header("Access-Control-Allow-Origin", "*");
res.set_header("Access-Control-Allow-Methods", "GET, OPTIONS");
res.set_header("Access-Control-Allow-Headers", "Content-Type");
res.set_header("Access-Control-Allow-Credentials", "true");
res.set_content("OK", "text/plain");
});

Expand Down
Loading