Skip to content

V3 31 0: LogViewer UI View #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davechri merged 2 commits into from
Sep 25, 2023
Merged

V3 31 0: LogViewer UI View #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc893c
v3-31-0: LogViewer UI view
davechri Sep 25, 2023
8d77f5d
3.31.0
davechri Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ MITM debugging proxy with a web GUI to view and modify all of the HTTP and HTTPS

### Install

> Mac: **[allproxy.dmg](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy-3.30.1-x64.dmg)**
> Mac: **[allproxy.dmg](https://github.com/allproxy/allproxy/releases/download/v3.31.0/allproxy-3.31.0-x64.dmg)**

> RedHat: **[allproxy.rpm](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy-3.30.1-1.x86_64.rpm)**
> RedHat: **[allproxy.rpm](https://github.com/allproxy/allproxy/releases/download/v3.31.0/allproxy-3.31.0-1.x86_64.rpm)**

> Ubuntu: **[allproxy.deb](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy_3.30.1_amd64.deb)**
> Ubuntu: **[allproxy.deb](https://github.com/allproxy/allproxy/releases/download/v3.31.0/allproxy_3.31.0_amd64.deb)**

> Windows: **[Setup.exe](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy-3.30.1.Setup.exe)**
> Windows: **[Setup.exe](https://github.com/allproxy/allproxy/releases/download/v3.31.0/allproxy-3.31.0.Setup.exe)**

> Other install options:
> 1. Install NPM package: **npm install -g allproxy**
Expand Down
6 changes: 5 additions & 1 deletion bin/allproxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ if [ ! -z "$SYMLINK" ]; then
fi
cd $BIN_DIR

npm start
if [ "$1" == "headless" ]; then
npm run headless
else
npm start
fi
47 changes: 27 additions & 20 deletions client/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
<!--

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -23,12 +21,13 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>AllProxy</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<title>AllProxy</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -38,5 +37,13 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>
<script>
if (document.location.pathname.includes('logviewer')) {
document.title = 'LogViewer';
} else {
document.title = 'AllProxy';
}
</script>

</html>
11 changes: 7 additions & 4 deletions client/src/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { observer } from 'mobx-react-lite';
import BreakpointStore from '../store/BreakpointStore';
import ExcludeTags from './ExcludeTags';
import { messageQueueStore } from '../store/MessageQueueStore';
import { logViewerStore } from '../store/LogViewerStore';

/**
* Footer view
Expand All @@ -19,11 +20,13 @@ const Footer = observer(({ filterStore, breakpointStore }: Props): JSX.Element =
<div>Messages: {messageQueueStore.getUnfilteredCount()} of {messageQueueStore.getTotalLength()}</div>
</div>
</div>
<div>
<div className="footer__item" title="Number of active breakpoints">
<div>Breakpoints: {breakpointStore.getBreakpointCount()}</div>
{!logViewerStore.isLogViewer() &&
<div>
<div className="footer__item" title="Number of active breakpoints">
<div>Breakpoints: {breakpointStore.getBreakpointCount()}</div>
</div>
</div>
</div>
}
<div className="footer__item footer__exclude-filter">
<div className="footer__exclude-label">Exclude:</div>
<div>
Expand Down
162 changes: 87 additions & 75 deletions client/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import JSONFieldsModal, { getJSONFields } from './JSONFieldsModal';
import { jsonLogStore, updateJSONRequestLabels } from '../store/JSONLogStore';
import FilterBar from './FilterBar';
import NotesModal from './NotesModal';
import { logViewerStore } from '../store/LogViewerStore';

let filterWasStopped = false;

Expand Down Expand Up @@ -72,7 +73,10 @@ const Header = observer(({ socketStore, messageQueueStore, snapshotStore, filter
width="24" height="24" />
</div>
<div className="header__title" onClick={() => window.location.reload()}>
<b><span style={{ color: '#f50057' }}>All</span>Proxy</b>
{logViewerStore.isLogViewer()
? <b><span style={{ color: '#f50057' }}>Log</span>Viewer</b>
: <b><span style={{ color: '#f50057' }}>All</span>Proxy</b>
}
</div>
<div className={"header__status " + statusClassName} title="Status"></div>

Expand Down Expand Up @@ -139,45 +143,49 @@ const Header = observer(({ socketStore, messageQueueStore, snapshotStore, filter
open={Boolean(moreMenuIcon)}
onClose={() => setMoreMenuIcon(null)}
>
<MenuItem
style={{
opacity: snapshotStore.getSnapshotCount() > 1 ? undefined : 0.3,
pointerEvents: snapshotStore.getSnapshotCount() > 1 ? undefined : 'none'
}}>
<div className="header__folder-minus fa fa-folder-minus" title="Delete all snapshots"
onClick={() => {
snapshotStore.deleteAllSnapshots();
setMoreMenuIcon(null);
}}
>
&nbsp;Delete Snapshots
</div>
</MenuItem>
<MenuItem style={{
opacity: !snapshotStore.isActiveSnapshotSelected() || messageQueueStore.getStopped()
? undefined : 0.3,
pointerEvents: !snapshotStore.isActiveSnapshotSelected() || messageQueueStore.getStopped()
? undefined : 'none'
}}>
<div className="header__export fa fa-download" title="Export snapshot file"
onClick={() => {
setOpenExportDialog(true);
setMoreMenuIcon(null);
}}
>
&nbsp;Export Snapshot
</div>
</MenuItem>
<MenuItem>
<div className="header__import fa fa-upload" title="Import snapshot file"
onClick={() => {
openSnapshotFileSelector();
setMoreMenuIcon(null);
}}
>
&nbsp;Import Snapshot
</div>
</MenuItem>
{!logViewerStore.isLogViewer() &&
<>
<MenuItem
style={{
opacity: snapshotStore.getSnapshotCount() > 1 ? undefined : 0.3,
pointerEvents: snapshotStore.getSnapshotCount() > 1 ? undefined : 'none'
}}>
<div className="header__folder-minus fa fa-folder-minus" title="Delete all snapshots"
onClick={() => {
snapshotStore.deleteAllSnapshots();
setMoreMenuIcon(null);
}}
>
&nbsp;Delete Snapshots
</div>
</MenuItem>
<MenuItem style={{
opacity: !snapshotStore.isActiveSnapshotSelected() || messageQueueStore.getStopped()
? undefined : 0.3,
pointerEvents: !snapshotStore.isActiveSnapshotSelected() || messageQueueStore.getStopped()
? undefined : 'none'
}}>
<div className="header__export fa fa-download" title="Export snapshot file"
onClick={() => {
setOpenExportDialog(true);
setMoreMenuIcon(null);
}}
>
&nbsp;Export Snapshot
</div>
</MenuItem>
<MenuItem>
<div className="header__import fa fa-upload" title="Import snapshot file"
onClick={() => {
openSnapshotFileSelector();
setMoreMenuIcon(null);
}}
>
&nbsp;Import Snapshot
</div>
</MenuItem>
</>
}
<MenuItem>
<div className="header__import fa fa-file" title="Import JSON file"
onClick={() => {
Expand Down Expand Up @@ -246,41 +254,45 @@ const Header = observer(({ socketStore, messageQueueStore, snapshotStore, filter
open={Boolean(settingsMenuIcon)}
onClose={() => setSettingsMenuIcon(null)}
>
<MenuItem>
<div className="fa fa-network-wired"
onClick={() => {
setSettingsMenuIcon(null);
settingsStore.toggleOpenSettingsModal();
settingsStore.reset();
if (!messageQueueStore.getStopped()) {
messageQueueStore.setStopped(true);
filterWasStopped = true;
}
}}
>
&nbsp;Proxy Configuration
</div>
</MenuItem>
<MenuItem>
<div className="fa fa-bug" title="Breakpoints"
onClick={() => {
setSettingsMenuIcon(null);
setShowBreakpointModal(true);
breakpointStore.init();
}}>
&nbsp;Breakpoints
</div>
</MenuItem>
<MenuItem>
<div className="fa fa-ban" title="No Capture List"
onClick={() => {
setSettingsMenuIcon(null);
setShowNoCaptureModal(true);
noCaptureStore.init();
}}>
&nbsp;No Capture List
</div>
</MenuItem>
{!logViewerStore.isLogViewer() &&
<>
<MenuItem>
<div className="fa fa-network-wired"
onClick={() => {
setSettingsMenuIcon(null);
settingsStore.toggleOpenSettingsModal();
settingsStore.reset();
if (!messageQueueStore.getStopped()) {
messageQueueStore.setStopped(true);
filterWasStopped = true;
}
}}
>
&nbsp;Proxy Configuration
</div>
</MenuItem>
<MenuItem>
<div className="fa fa-bug" title="Breakpoints"
onClick={() => {
setSettingsMenuIcon(null);
setShowBreakpointModal(true);
breakpointStore.init();
}}>
&nbsp;Breakpoints
</div>
</MenuItem>
<MenuItem>
<div className="fa fa-ban" title="No Capture List"
onClick={() => {
setSettingsMenuIcon(null);
setShowNoCaptureModal(true);
noCaptureStore.init();
}}>
&nbsp;No Capture List
</div>
</MenuItem>
</>
}
{window.darkMode &&
<MenuItem>
<div className="header__import fa fa-image" title="Theme"
Expand Down
13 changes: 7 additions & 6 deletions client/src/components/HelpDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { TabContext, TabPanel } from '@material-ui/lab';
import { jsonLogStore, updateJSONRequestLabels } from '../store/JSONLogStore';
import JSONFieldsModal, { getJSONFields } from './JSONFieldsModal';
import { snapshotStore } from '../store/SnapshotStore';
import { logViewerStore } from '../store/LogViewerStore';

type Props = {
open: boolean,
Expand All @@ -21,7 +22,7 @@ type Props = {
const HelpDialog = observer(({ open, onClose }: Props) => {
const [openImportJSONFileDialog, setOpenImportJSONFileDialog] = React.useState(false);
const [showSessionModal, setShowSessionModal] = React.useState(false);
const [tabValue, setTabValue] = React.useState('1');
const [tabValue, setTabValue] = React.useState(logViewerStore.isLogViewer() ? '4' : '1');

const [showJSONFieldsModal, setShowJSONFieldsModal] = React.useState(false);
const [jsonFields, setJsonFields] = React.useState<{ name: string, count: number, selected: boolean }[]>([]);
Expand Down Expand Up @@ -95,10 +96,10 @@ const HelpDialog = observer(({ open, onClose }: Props) => {
indicatorColor="primary"
aria-label="help-tabs"
>
<Tab value="1" label="Quick Start" />
<Tab value="2" label="Certificates" />
<Tab value="3" label="Filtering" />
<Tab value="4" label="JSON Logs" />
{!logViewerStore.isLogViewer() && <Tab value="1" label="Quick Start" />}
{!logViewerStore.isLogViewer() && <Tab value="2" label="Certificates" />}
{!logViewerStore.isLogViewer() && <Tab value="3" label="Filtering" />}
<Tab value="4" label="Log Viewer" />
</Tabs>
<TabPanel value="1" key="1">
<h4>Quick Start</h4>
Expand Down Expand Up @@ -255,7 +256,7 @@ const HelpDialog = observer(({ open, onClose }: Props) => {
</div>
</TabPanel>
<TabPanel value="4" key="4">
<h4>JSON Logs</h4>
<h4>Log Viewer</h4>
JSON logs can be imported and annotated for easier reading.
<p></p>
<h5>Annotating JSON Fields</h5>
Expand Down
Loading