wuxu/sms_forwarding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 取消 Web 挑战头鉴权

Browse Source
This commit is contained in:
wuxu
2026-06-27 16:35:58 +08:00
parent ecca396792
commit e03a7a141c
4 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1 -2
View File
@@ -13,7 +13,6 @@
"axios": "^1.6.2", "axios": "^1.6.2",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"express": "^4.18.2", "express": "^4.18.2",
"express-basic-auth": "^1.2.1",
"node-pdu": "^2.1.2", "node-pdu": "^2.1.2",
"nodemailer": "^6.9.7", "nodemailer": "^6.9.7",
"serialport": "^12.0.0", "serialport": "^12.0.0",
@@ -2045,4 +2044,4 @@
} }
} }
} }
} }
package.json
+1 -2
View File
@@ -23,7 +23,6 @@
"@serialport/parser-readline": "^12.0.0", "@serialport/parser-readline": "^12.0.0",
"node-pdu": "^2.1.2", "node-pdu": "^2.1.2",
"express": "^4.18.2", "express": "^4.18.2",
"express-basic-auth": "^1.2.1",
"nodemailer": "^6.9.7", "nodemailer": "^6.9.7",
"axios": "^1.6.2", "axios": "^1.6.2",
"winston": "^3.11.0", "winston": "^3.11.0",
@@ -32,4 +31,4 @@
"devDependencies": { "devDependencies": {
"nodemon": "^3.0.2" "nodemon": "^3.0.2"
} }
} }
public/admin.html
+1 -1
View File
@@ -411,7 +411,7 @@
</svg> </svg>
<span>SMS Gateway</span> <span>SMS Gateway</span>
</span> </span>
<span class="footer__meta">© <span id="footerYear">2026</span> · Basic Auth protected · Built on Node.js + <span class="footer__meta">© <span id="footerYear">2026</span> · Token protected · Built on Node.js +
ML307A</span> ML307A</span>
</div> </div>
</footer> </footer>
src/api.js
+9 -31
View File
@@ -50,7 +50,7 @@ class APIServer {
// JSON解析 // JSON解析
this.app.use(express.json()); this.app.use(express.json());
// Web Token认证，API保留Basic Auth兼容 // Web Token认证
this.app.use((req, res, next) => { this.app.use((req, res, next) => {
this.authenticateRequest(req, res, next); this.authenticateRequest(req, res, next);
}); });
@@ -75,22 +75,23 @@ class APIServer {
return next(); return next();
} }
if (this.isWebRoute(req) && this.getConfiguredWebToken()) { if (this.isWebRoute(req)) {
return this.sendTokenGate(res); const webToken = this.getConfiguredWebToken();
} if (webToken) {
return this.sendTokenGate(res);
}
if (this.hasValidBasicAuth(req)) { return res.status(401).send('未配置 webToken');
return next();
} }
if (req.path.startsWith('/api/')) { if (req.path.startsWith('/api/')) {
return res.status(401).json({ return res.status(401).json({
success: false, success: false,
error: this.getConfiguredWebToken() ? '需要有效token或Basic Auth' : '需要Basic Auth' error: this.getConfiguredWebToken() ? '需要有效token' : '未配置webToken'
}); });
} }
return this.sendBasicAuthChallenge(res); return res.status(401).send(this.getConfiguredWebToken() ? '需要有效token' : '未配置 webToken');
} }
getConfiguredWebToken() { getConfiguredWebToken() {
@@ -143,24 +144,6 @@ class APIServer {
return `${url.pathname}${url.search}`; return `${url.pathname}${url.search}`;
} }
hasValidBasicAuth(req) {
const auth = req.get('authorization') || '';
if (!auth.startsWith('Basic ')) {
return false;
}
const decoded = Buffer.from(auth.slice(6), 'base64').toString('utf8');
const separatorIndex = decoded.indexOf(':');
if (separatorIndex === -1) {
return false;
}
const username = decoded.slice(0, separatorIndex);
const password = decoded.slice(separatorIndex + 1);
return this.safeEqual(username, this.config.api.auth.username) &&
this.safeEqual(password, this.config.api.auth.password);
}
safeEqual(actual, expected) { safeEqual(actual, expected) {
const actualBuffer = Buffer.from(String(actual)); const actualBuffer = Buffer.from(String(actual));
const expectedBuffer = Buffer.from(String(expected)); const expectedBuffer = Buffer.from(String(expected));
@@ -176,11 +159,6 @@ class APIServer {
return req.path === '/' || req.path === '/admin' || req.path.startsWith('/assets/'); return req.path === '/' || req.path === '/admin' || req.path.startsWith('/assets/');
} }
sendBasicAuthChallenge(res) {
res.set('WWW-Authenticate', 'Basic realm="SMS Gateway"');
return res.status(401).send('Authentication required');
}
sendTokenGate(res) { sendTokenGate(res) {
res.set('Cache-Control', 'no-store'); res.set('Cache-Control', 'no-store');
return res.status(401).type('html').send(`<!doctype html> return res.status(401).type('html').send(`<!doctype html>