mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3490 from chakflying/fix/radius-retry 

Fix: Incorrect radius error & retry handling
This commit is contained in:
Louis Lam 2023-07-31 17:47:26 +08:00 committed by GitHub
parent 27ce47277b c0eb0cb42c
commit 0a59fef7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/model/monitor.js
View File

@ -792,29 +792,19 @@ class Monitor extends BeanModel {
port = this.port; port = this.port;
} }
try { const resp = await radius(
const resp = await radius( this.hostname,
this.hostname, this.radiusUsername,
this.radiusUsername, this.radiusPassword,
this.radiusPassword, this.radiusCalledStationId,
this.radiusCalledStationId, this.radiusCallingStationId,
this.radiusCallingStationId, this.radiusSecret,
this.radiusSecret, port,
port, this.interval * 1000 * 0.4,
this.interval * 1000 * 0.8, );
);
if (resp.code) { bean.msg = resp.code;
bean.msg = resp.code; bean.status = UP;
}
bean.status = UP;
} catch (error) {
bean.status = DOWN;
if (error.response?.code) {
bean.msg = error.response.code;
} else {
bean.msg = error.message;
}
}
bean.ping = dayjs().valueOf() - startTime; bean.ping = dayjs().valueOf() - startTime;
} else if (this.type === "redis") { } else if (this.type === "redis") {
let startTime = dayjs().valueOf(); let startTime = dayjs().valueOf();

7
server/util-server.js
View File

@ -486,6 +486,7 @@ exports.radius = function (
host: hostname, host: hostname,
hostPort: port, hostPort: port,
timeout: timeout, timeout: timeout,
retries: 1,
dictionaries: [ file ], dictionaries: [ file ],
}); });
@ -497,6 +498,12 @@ exports.radius = function (
[ attributes.CALLING_STATION_ID, callingStationId ], [ attributes.CALLING_STATION_ID, callingStationId ],
[ attributes.CALLED_STATION_ID, calledStationId ], [ attributes.CALLED_STATION_ID, calledStationId ],
], ],
}).catch((error) => {
if (error.response?.code) {
throw Error(error.response.code);
} else {
throw Error(error.message);
}
}); });
}; };

13
test/test-radius.dockerfile Normal file
View File

@ -0,0 +1,13 @@
# Container running a test radius server
# More instructions in https://github.com/louislam/uptime-kuma/pull/1635
FROM freeradius/freeradius-server:latest
RUN mkdir -p /etc/raddb/mods-config/files/
RUN echo "client net {" > /etc/raddb/clients.conf
RUN echo " ipaddr = 172.17.0.0/16" >> /etc/raddb/clients.conf
RUN echo " secret = testing123" >> /etc/raddb/clients.conf
RUN echo "}" >> /etc/raddb/clients.conf
RUN echo "bob Cleartext-Password := \"testpw\"" > /etc/raddb/mods-config/files/authorize