From 3dbc892cb9e1dce9802d8b79869e694b9562883b Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Mon, 1 Aug 2022 15:16:39 +0200 Subject: [PATCH 1/3] Island: Rename `api/version-update` to `api/island/version` --- monkey/monkey_island/cc/resources/version_update.py | 3 +-- .../cc/ui/src/components/logo/VersionComponent.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/monkey/monkey_island/cc/resources/version_update.py b/monkey/monkey_island/cc/resources/version_update.py index a2cd6abf6..8ec56abed 100644 --- a/monkey/monkey_island/cc/resources/version_update.py +++ b/monkey/monkey_island/cc/resources/version_update.py @@ -8,8 +8,7 @@ logger = logging.getLogger(__name__) class VersionUpdate(AbstractResource): - # API Spec: Rename to /version-info - urls = ["/api/version-update"] + urls = ["/api/island/version"] def __init__(self): super(VersionUpdate, self).__init__() diff --git a/monkey/monkey_island/cc/ui/src/components/logo/VersionComponent.js b/monkey/monkey_island/cc/ui/src/components/logo/VersionComponent.js index cc0aea203..26733d579 100644 --- a/monkey/monkey_island/cc/ui/src/components/logo/VersionComponent.js +++ b/monkey/monkey_island/cc/ui/src/components/logo/VersionComponent.js @@ -14,7 +14,7 @@ class VersionComponent extends React.Component { } componentDidMount() { - fetch('/api/version-update') // This is not authenticated on purpose + fetch('/api/island/version') // This is not authenticated on purpose .then(res => res.json()) .then(res => { this.setState({ From 56c325f08f558d8936430c1e4ddd6662a4b0cef2 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Mon, 1 Aug 2022 15:20:54 +0200 Subject: [PATCH 2/3] Island: Rename VersionUpdate to Version --- monkey/monkey_island/cc/app.py | 4 ++-- .../cc/resources/{version_update.py => version.py} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename monkey/monkey_island/cc/resources/{version_update.py => version.py} (88%) diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py index 37cae6cdb..56c3283e9 100644 --- a/monkey/monkey_island/cc/app.py +++ b/monkey/monkey_island/cc/app.py @@ -47,7 +47,7 @@ from monkey_island.cc.resources.root import Root from monkey_island.cc.resources.security_report import SecurityReport from monkey_island.cc.resources.telemetry import Telemetry from monkey_island.cc.resources.telemetry_feed import TelemetryFeed -from monkey_island.cc.resources.version_update import VersionUpdate +from monkey_island.cc.resources.version import Version from monkey_island.cc.resources.zero_trust.finding_event import ZeroTrustFindingEvent from monkey_island.cc.resources.zero_trust.zero_trust_report import ZeroTrustReport from monkey_island.cc.server_utils.consts import MONKEY_ISLAND_ABS_PATH @@ -185,7 +185,7 @@ def init_restful_endpoints(api: FlaskDIWrapper): api.add_resource(PropagationCredentials) api.add_resource(RemoteRun) - api.add_resource(VersionUpdate) + api.add_resource(Version) api.add_resource(StopAgentCheck) api.add_resource(StopAllAgents) diff --git a/monkey/monkey_island/cc/resources/version_update.py b/monkey/monkey_island/cc/resources/version.py similarity index 88% rename from monkey/monkey_island/cc/resources/version_update.py rename to monkey/monkey_island/cc/resources/version.py index 8ec56abed..961b1175d 100644 --- a/monkey/monkey_island/cc/resources/version_update.py +++ b/monkey/monkey_island/cc/resources/version.py @@ -7,11 +7,11 @@ from monkey_island.cc.services.version_update import VersionUpdateService logger = logging.getLogger(__name__) -class VersionUpdate(AbstractResource): +class Version(AbstractResource): urls = ["/api/island/version"] def __init__(self): - super(VersionUpdate, self).__init__() + super(Version, self).__init__() # We don't secure this since it doesn't give out any private info and we want UI to know version # even when not authenticated From 00f4fa4557f0064cdbfbd1c9807a5503f4ad4820 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Mon, 1 Aug 2022 15:30:41 +0200 Subject: [PATCH 3/3] Changelog: Add entry for renaming `api/version-update` to `api/island/version` --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb5f05a03..5aa8eb98f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/). - Agent configuration structure. #1996, #1998, #1961, #1997, #1994, #1741, #1761, #1695, #1605, #2028, #2003 - `/api/island-mode` to accept and return new "unset" mode. #2036 +- `/api/version-update` to `api/island/version`. #2109 ### Removed - VSFTPD exploiter. #1533