Skip to content

Commit

Permalink
Set default ua for axios: Uptime-Kuma/version instead of `axios/ver…
Browse files Browse the repository at this point in the history
…sion`
  • Loading branch information
louislam committed Oct 18, 2023
1 parent e11aad2 commit bbaba29
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 0 additions & 1 deletion server/docker.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class DockerHost {
url: "/containers/json?all=true",
headers: {
"Accept": "*/*",
"User-Agent": "Uptime-Kuma/" + version
},
};

Expand Down
3 changes: 0 additions & 3 deletions server/model/monitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ class Monitor extends BeanModel {
timeout: this.timeout * 1000,
headers: {
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
"User-Agent": "Uptime-Kuma/" + version,
...(contentType ? { "Content-Type": contentType } : {}),
...(basicAuthHeader),
...(oauth2AuthHeader),
Expand Down Expand Up @@ -627,7 +626,6 @@ class Monitor extends BeanModel {
timeout: this.timeout * 1000,
headers: {
"Accept": "*/*",
"User-Agent": "Uptime-Kuma/" + version,
},
httpsAgent: CacheableDnsHttpAgent.getHttpsAgent({
maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
Expand Down Expand Up @@ -681,7 +679,6 @@ class Monitor extends BeanModel {
timeout: this.interval * 1000 * 0.8,
headers: {
"Accept": "*/*",
"User-Agent": "Uptime-Kuma/" + version,
},
httpsAgent: CacheableDnsHttpAgent.getHttpsAgent({
maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
Expand Down
8 changes: 8 additions & 0 deletions server/uptime-kuma-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const { Settings } = require("./settings");
const dayjs = require("dayjs");
const childProcess = require("child_process");
const path = require("path");
const axios = require("axios");
// DO NOT IMPORT HERE IF THE MODULES USED `UptimeKumaServer.getInstance()`, put at the bottom of this file instead.

/**
Expand Down Expand Up @@ -83,6 +84,9 @@ class UptimeKumaServer {
const sslCert = args["ssl-cert"] || process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || undefined;
const sslKeyPassphrase = args["ssl-key-passphrase"] || process.env.UPTIME_KUMA_SSL_KEY_PASSPHRASE || process.env.SSL_KEY_PASSPHRASE || undefined;

// Set axios default user-agent to Uptime-Kuma/version
axios.defaults.headers.common["User-Agent"] = this.getUserAgent();

log.debug("server", "Creating express and socket.io instance");
this.app = express();
if (sslKey && sslCert) {
Expand Down Expand Up @@ -411,6 +415,10 @@ class UptimeKumaServer {
}
}
}

getUserAgent() {

Check failure on line 419 in server/uptime-kuma-server.js

View workflow job for this annotation

GitHub Actions / check-linters

Missing JSDoc comment
return "Uptime-Kuma/" + require("../package.json").version

Check failure on line 420 in server/uptime-kuma-server.js

View workflow job for this annotation

GitHub Actions / check-linters

Missing semicolon
}
}

module.exports = {
Expand Down

0 comments on commit bbaba29

Please sign in to comment.