p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Island: Fix automatic jumping in telemetry feed 

Fixes #1850
This commit is contained in:
Ilija Lazoroski 2022-04-21 14:45:35 +02:00 committed by Mike Salvatore
parent 57c5457a17
commit 53b405a115
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -81,6 +81,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
- A bug where bogus users were collected by Mimikatz and added to the config. #1860 - A bug where bogus users were collected by Mimikatz and added to the config. #1860
- A bug where windows executable was not self deleting. #1763 - A bug where windows executable was not self deleting. #1763
- Incorrect line number in the telemetry overview window on the Map page. #1850 - Incorrect line number in the telemetry overview window on the Map page. #1850
- Automatic jumping to the bottom in the telemetry overview windows. #1850
### Security ### Security
- Change SSH exploiter so that it does not set the permissions of the agent - Change SSH exploiter so that it does not set the permissions of the agent

15
monkey/monkey_island/cc/ui/src/components/map/TelemetryLog.tsx
View File

@ -12,11 +12,11 @@ const TelemetryLog = (props: { onStatusChange: Function }) => {
let [telemetryUpdateInProgress, setTelemetryUpdateInProgress] = useState(false); let [telemetryUpdateInProgress, setTelemetryUpdateInProgress] = useState(false);
let [telemetry, setTelemetry] = useState([]); let [telemetry, setTelemetry] = useState([]);
let [lastTelemetryTimestamp, setLastTelemetryTimestamp] = useState(null); let [lastTelemetryTimestamp, setLastTelemetryTimestamp] = useState(null);
let [isScrolledUp, setIsScrolledUp] = useState(false); let isScrolledUp = useRef(false);
let [telemetryLines, setTelemetryLines] = useState(0); let [telemetryLines, setTelemetryLines] = useState(0);
let [telemetryCurrentLine, setTelemetryCurrentLine] = useState(0); let [telemetryCurrentLine, setTelemetryCurrentLine] = useState(0);
let scrollTop = 0; let scrollTop = useRef(0);
const telemetryConsole = useRef(null); const telemetryConsole = useRef(null);
useEffect(() => { useEffect(() => {
@ -44,9 +44,11 @@ const TelemetryLog = (props: { onStatusChange: Function }) => {
props.onStatusChange(); props.onStatusChange();
let telemConsoleRef = telemetryConsole.current; let telemConsoleRef = telemetryConsole.current;
if (!isScrolledUp) { // we handle the lines again so if we have scrolled, we will have updated counter
handleTemeletryLine(telemConsoleRef);
if (!isScrolledUp.current) {
telemConsoleRef.scrollTop = telemConsoleRef.scrollHeight - telemConsoleRef.clientHeight; telemConsoleRef.scrollTop = telemConsoleRef.scrollHeight - telemConsoleRef.clientHeight;
scrollTop = telemConsoleRef.scrollTop; scrollTop.current = telemConsoleRef.scrollTop;
} }
} }
}); });
@ -54,11 +56,14 @@ const TelemetryLog = (props: { onStatusChange: Function }) => {
function handleScroll(e) { function handleScroll(e) {
let element = e.target; let element = e.target;
isScrolledUp.current = element.scrollTop < scrollTop.current;
handleTemeletryLine(element);
}
function handleTemeletryLine(element) {
let telemetryStyle = window.getComputedStyle(element); let telemetryStyle = window.getComputedStyle(element);
let telemetryLineHeight = parseInt((telemetryStyle.lineHeight).replace('px', '')); let telemetryLineHeight = parseInt((telemetryStyle.lineHeight).replace('px', ''));
setIsScrolledUp((element.scrollTop < scrollTop));
// Zooming in or out doesn't change the number of lines that are visible at once i.e. 5. // Zooming in or out doesn't change the number of lines that are visible at once i.e. 5.
setTelemetryCurrentLine(Math.trunc(element.scrollTop / telemetryLineHeight) + 5); setTelemetryCurrentLine(Math.trunc(element.scrollTop / telemetryLineHeight) + 5);
setTelemetryLines(Math.trunc(element.scrollHeight / telemetryLineHeight)); setTelemetryLines(Math.trunc(element.scrollHeight / telemetryLineHeight));