@@ -814,8 +810,8 @@ function switchPage(name) {
}
function switchAdminTab(name) {
- document.querySelectorAll('.admin-tab').forEach((t,i) => {
- t.classList.toggle('active', ['s3','relay','ampp','extension','users','folders'][i] === name);
+ document.querySelectorAll('.admin-tab').forEach(t => {
+ t.classList.toggle('active', t.dataset.tab === name);
});
document.querySelectorAll('.admin-panel').forEach(p => p.classList.toggle('active', p.id === `admin-${name}`));
if (name === 'users') loadUsers();
diff --git a/server.js b/server.js
index c95057e..713dd1d 100644
--- a/server.js
+++ b/server.js
@@ -86,32 +86,35 @@ function setTree(t) { db.folderTree = t; saveData(db); }
let s3Client = null;
function buildS3Client(cfg) {
- const endpoint = cfg.endpoint || "";
- const isHttpsEndpoint = endpoint.startsWith("https");
+ const endpoint = (cfg.endpoint || "").trim();
+ const hasCustomEndpoint = endpoint.length > 0;
+ const isHttps = !hasCustomEndpoint || endpoint.startsWith("https");
const agentOpts = { keepAlive: true, maxSockets: 25 };
- const agent = isHttpsEndpoint
+ const agent = isHttps
? new https.Agent({ ...agentOpts, rejectUnauthorized: false })
: new http.Agent(agentOpts);
return new S3Client({
- endpoint: endpoint || undefined,
+ // No endpoint → AWS SDK uses the official AWS S3 endpoint for the region
+ ...(hasCustomEndpoint ? { endpoint } : {}),
region: cfg.region || "us-east-1",
credentials: {
accessKeyId: cfg.accessKeyId || "",
secretAccessKey: cfg.secretAccessKey || "",
},
- forcePathStyle: true,
+ // forcePathStyle needed for MinIO/Ceph/generic S3; harmless for AWS
+ forcePathStyle: hasCustomEndpoint,
requestHandler: new NodeHttpHandler({
connectionTimeout: 15000,
socketTimeout: 300000,
- ...(isHttpsEndpoint ? { httpsAgent: agent } : { httpAgent: agent }),
+ ...(isHttps ? { httpsAgent: agent } : { httpAgent: agent }),
}),
});
}
function initS3() {
const cfg = db.s3Config || {};
- if (cfg.endpoint && cfg.accessKeyId && cfg.secretAccessKey && cfg.bucket) {
+ if (cfg.accessKeyId && cfg.secretAccessKey && cfg.bucket) {
s3Client = buildS3Client(cfg);
console.log(`[S3] Client initialized → ${cfg.endpoint} / ${cfg.bucket}`);
} else {
@@ -340,8 +343,9 @@ app.get("/api/s3/config", requireAdmin, (req, res) => {
app.put("/api/s3/config", requireAdmin, (req, res) => {
const { endpoint, region, bucket, accessKeyId, secretAccessKey } = req.body;
- if (!endpoint || !region || !bucket || !accessKeyId)
- return res.status(400).json({ success: false, error: "endpoint, region, bucket, and accessKeyId are required" });
+ // endpoint is optional for AWS S3 (leave blank to use AWS default)
+ if (!region || !bucket || !accessKeyId)
+ return res.status(400).json({ success: false, error: "region, bucket, and accessKeyId are required" });
if (!db.s3Config) db.s3Config = {};
db.s3Config.endpoint = endpoint.trim();
db.s3Config.region = region.trim();
@@ -363,8 +367,8 @@ app.post("/api/s3/test", requireAdmin, async (req, res) => {
accessKeyId: accessKeyId || db.s3Config?.accessKeyId || "",
secretAccessKey: secretAccessKey || db.s3Config?.secretAccessKey || "",
};
- if (!testCfg.endpoint || !testCfg.bucket || !testCfg.accessKeyId || !testCfg.secretAccessKey)
- return res.status(400).json({ success: false, error: "All S3 fields required to test connection" });
+ if (!testCfg.bucket || !testCfg.accessKeyId || !testCfg.secretAccessKey)
+ return res.status(400).json({ success: false, error: "Bucket, Access Key ID, and Secret Key are required to test" });
const testClient = buildS3Client(testCfg);
const testKey = `_dragonwind_test_${Date.now()}.txt`;