public/simple-object-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixing

Browse Source
This commit is contained in:
Your Name
2025-05-25 14:48:05 +12:00
parent d849aa73f4
commit 3cffb6cd94
5 changed files with 98 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -83,10 +83,20 @@ The server can be configured by creating a JSON configuration file at `~/.config
"host": "localhost", "host": "localhost",
"port": 8080, "port": 8080,
"storage_path": "/path/to/storage", "storage_path": "/path/to/storage",
"write_tokens": ["your-secret-token"] "write_tokens": ["your-secret-token"],
} }
``` ```
Optionally, you can modify the CORS configuration. Defaults:
```json
"cors": {
"allowed_origins": ["*"],
"allowed_methods": ["GET", "PUT", "POST", "DELETE", "OPTIONS"],
"allowed_headers": ["Authorization", "Content-Type"],
"allow_credentials": false
}
```
## API Endpoints ## API Endpoints
### Upload a File ### Upload a File

17
src/config.cpp
View File

@@ -42,6 +42,23 @@ bool load_config(const std::string& config_path, ServerConfig& config) {
config.port = j["port"].get<uint16_t>(); config.port = j["port"].get<uint16_t>();
} }
// Parse CORS configuration
if (j.contains("cors")) {
const auto& cors = j["cors"];
if (cors.contains("allowed_origins")) {
config.allowed_origins = cors["allowed_origins"].get<std::vector<std::string>>();
}
if (cors.contains("allowed_methods")) {
config.allowed_methods = cors["allowed_methods"].get<std::vector<std::string>>();
}
if (cors.contains("allowed_headers")) {
config.allowed_headers = cors["allowed_headers"].get<std::vector<std::string>>();
}
if (cors.contains("allow_credentials")) {
config.allow_credentials = cors["allow_credentials"].get<bool>();
}
}
return true; return true;
} catch (const std::exception& e) { } catch (const std::exception& e) {
std::cerr << "Error parsing config file: " << e.what() << std::endl; std::cerr << "Error parsing config file: " << e.what() << std::endl;

5
src/config.hpp
View File

@@ -12,6 +12,11 @@ struct ServerConfig {
std::filesystem::path object_store_path; std::filesystem::path object_store_path;
std::string host = "0.0.0.0"; std::string host = "0.0.0.0";
uint16_t port = 0; uint16_t port = 0;
// CORS configuration
std::vector<std::string> allowed_origins = {"*"}; // Default to allow all origins
std::vector<std::string> allowed_methods = {"GET", "PUT", "POST", "DELETE", "OPTIONS"};
std::vector<std::string> allowed_headers = {"Authorization", "Content-Type"};
bool allow_credentials = false;
}; };
bool load_config(const std::string& config_path, ServerConfig& config); bool load_config(const std::string& config_path, ServerConfig& config);

62
src/server.cpp
View File

@@ -123,6 +123,16 @@ void Server::stop() {
} }
void Server::setup_routes() { void Server::setup_routes() {
// Add CORS preflight handler for all routes
server_.Options(".*", [this](const httplib::Request& req, httplib::Response& res) {
handle_cors_preflight(req, res);
});
// Add CORS headers to all responses
server_.set_post_routing_handler([this](const httplib::Request& req, httplib::Response& res) {
add_cors_headers(req, res);
});
const std::string welcome_page = "<html><body><h1>simple_object_storage Template Registry</h1></body></html>"; const std::string welcome_page = "<html><body><h1>simple_object_storage Template Registry</h1></body></html>";
// Welcome page // Welcome page
server_.Get("/", [welcome_page](const httplib::Request&, httplib::Response& res) { server_.Get("/", [welcome_page](const httplib::Request&, httplib::Response& res) {
@@ -180,6 +190,58 @@ void Server::setup_routes() {
}); });
} }
void Server::handle_cors_preflight(const httplib::Request& req, httplib::Response& res) {
add_cors_headers(req, res);
res.status = 204; // No content
}
void Server::add_cors_headers(const httplib::Request& req, httplib::Response& res) {
// Get the origin from the request
std::string origin = req.get_header_value("Origin");
// If no origin header, no CORS headers needed
if (origin.empty()) {
return;
}
// Check if origin is allowed
bool origin_allowed = false;
if (config_.allowed_origins.empty() ||
std::find(config_.allowed_origins.begin(), config_.allowed_origins.end(), "*") != config_.allowed_origins.end()) {
origin_allowed = true;
} else {
origin_allowed = std::find(config_.allowed_origins.begin(), config_.allowed_origins.end(), origin) != config_.allowed_origins.end();
}
if (origin_allowed) {
res.set_header("Access-Control-Allow-Origin", origin);
// Add other CORS headers
std::string methods = join(config_.allowed_methods, ", ");
res.set_header("Access-Control-Allow-Methods", methods);
std::string headers = join(config_.allowed_headers, ", ");
res.set_header("Access-Control-Allow-Headers", headers);
if (config_.allow_credentials) {
res.set_header("Access-Control-Allow-Credentials", "true");
}
// Add max age for preflight requests
res.set_header("Access-Control-Max-Age", "86400"); // 24 hours
}
}
std::string Server::join(const std::vector<std::string>& strings, const std::string& delimiter) {
if (strings.empty()) return "";
std::string result = strings[0];
for (size_t i = 1; i < strings.size(); ++i) {
result += delimiter + strings[i];
}
return result;
}
void Server::handle_get_object(const httplib::Request& req, httplib::Response& res) { void Server::handle_get_object(const httplib::Request& req, httplib::Response& res) {
const auto& key = req.matches[1].str(); const auto& key = req.matches[1].str();
std::string hash_str = key; std::string hash_str = key;

3
src/server.hpp
View File

@@ -34,6 +34,9 @@ private:
void handle_get_metadata(const httplib::Request& req, httplib::Response& res); void handle_get_metadata(const httplib::Request& req, httplib::Response& res);
void handle_delete_object(const httplib::Request& req, httplib::Response& res); void handle_delete_object(const httplib::Request& req, httplib::Response& res);
void handle_exists(const httplib::Request& req, httplib::Response& res); void handle_exists(const httplib::Request& req, httplib::Response& res);
void handle_cors_preflight(const httplib::Request& req, httplib::Response& res);
void add_cors_headers(const httplib::Request& req, httplib::Response& res);
std::string join(const std::vector<std::string>& strings, const std::string& delimiter);
bool init_db(); bool init_db();