Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions crates/e5r-cli/src/dashboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,22 @@ fn serve_inner(
respond(request, 200, kind, body.into());
continue;
}
// Fonts ship inside the binary: the workspace stays offline and the CSP stays 'self'.
let font: Option<&'static [u8]> = match path.as_str() {
"/fonts/archivo.woff2" => Some(include_bytes!("dashboard/fonts/archivo.woff2")),
"/fonts/plex-mono-400.woff2" => Some(include_bytes!("dashboard/fonts/plex-mono-400.woff2")),
"/fonts/plex-mono-500.woff2" => Some(include_bytes!("dashboard/fonts/plex-mono-500.woff2")),
"/fonts/plex-mono-600.woff2" => Some(include_bytes!("dashboard/fonts/plex-mono-600.woff2")),
_ => None,
};
if let Some(body) = font {
let response = Response::from_data(body)
.with_header(header("Content-Type", "font/woff2"))
.with_header(header("Cache-Control", "max-age=86400, immutable"))
.with_header(header("X-Content-Type-Options", "nosniff"));
let _ = request.respond(response);
continue;
}
}
if let Some(registry) = &registry {
if path == "/api/projects" {
Expand Down
5 changes: 5 additions & 0 deletions crates/e5r-cli/src/dashboard/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,11 @@ $("font-larger").onclick = () => resizeCode(1);
resizeCode();
window.addEventListener("hashchange", route);
window.addEventListener("keydown", (e) => {
const typing = ["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName);
if (!typing && !$("task-dialog").open && !e.altKey && !e.ctrlKey && !e.metaKey && (e.key === "1" || e.key === "2")) {
document.querySelector(`[data-view="${e.key === "1" ? "overview" : "workspace"}"]`).click();
return;
}
if ($("workspace").hidden || $("task-dialog").open ||
["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName)) return;
if (e.key === "/") {
Expand Down
93 changes: 93 additions & 0 deletions crates/e5r-cli/src/dashboard/fonts/OFL-Archivo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2020 The Archivo Project Authors (https://github.com/Omnibus-Type/Archivo) Archivo-Italic[wdth,wght].ttf: Copyright 2020 The Archivo Project Authors (https://github.com/Omnibus-Type/Archivo)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
93 changes: 93 additions & 0 deletions crates/e5r-cli/src/dashboard/fonts/OFL-IBM-Plex-Mono.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-ThinItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-ExtraLight.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-ExtraLightItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Light.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-LightItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Regular.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Italic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Medium.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-MediumItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-SemiBold.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-SemiBoldItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Bold.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-BoldItalic.ttf: Copyright 2017 IBM Corp. All rights reserved.

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file added crates/e5r-cli/src/dashboard/fonts/archivo.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
86 changes: 37 additions & 49 deletions crates/e5r-cli/src/dashboard/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,27 @@
</head>
<body>
<div class="shell">
<aside class="rail">
<a class="brand" href="#overview">e5r<span>ANALYSIS WORKSPACE</span></a>
<a id="all-projects" class="all-projects" href="/" hidden
>← All projects</a
>
<div class="rail-label">PROJECT</div>
<div id="project-name" class="project-name">Loading project…</div>
<nav aria-label="Workspace">
<button id="nav-overview" class="nav selected" data-view="overview">
Overview</button
><button id="nav-workspace" class="nav" data-view="workspace">
Decompiler
</button>
</nav>
<div class="rail-foot">
<span class="local-dot"></span> LOCAL WORKSPACE
<p>Human and agent, same state.</p>
<small
>Binary & annotations: analysis snapshot.<br />Restart the server to
reload analysis.</small
>
<header class="bar">
<div class="bar-left">
<a class="brand" href="#overview">e5r</a>
<a id="all-projects" class="all-projects" href="/" hidden>← all projects</a>
<span id="project-name" class="project-name">Loading project…</span>
<nav aria-label="Workspace">
<button id="nav-overview" class="nav selected" data-view="overview"><kbd>1</kbd>overview</button
><button id="nav-workspace" class="nav" data-view="workspace"><kbd>2</kbd>decompiler</button>
</nav>
</div>
</aside>
<div class="crumb">
<span id="view-title">Project overview</span
><span id="binary-name" class="muted"></span>
</div>
<div class="top-actions">
<span class="local-dot" aria-hidden="true"></span><span class="seg">local</span
><span id="sync" class="seg muted" aria-live="polite">Connecting…</span
><button id="refresh" class="seg seg-button">refresh tasks</button>
</div>
</header>
<div class="body">
<header class="topbar">
<div class="crumb">
<span id="view-title">Project overview</span
><span id="binary-name" class="muted"></span>
</div>
<div class="top-actions">
<span id="sync" class="muted" aria-live="polite">Connecting…</span
><button id="refresh" class="button subtle">Refresh tasks</button
>
</div>
</header>
<div id="error" role="alert" hidden></div>
<main id="overview" class="overview">
<section class="hero">
Expand Down Expand Up @@ -125,23 +111,9 @@ <h2>Project work</h2>
</section>
</main>
<main id="workspace" class="workspace" hidden>
<div class="workspace-tools" aria-label="Workspace layout">
<div class="layout-controls">
<button id="toggle-functions" class="button subtle" aria-expanded="true" aria-controls="function-pane">Functions</button>
<button id="toggle-context" class="button subtle" aria-expanded="false" aria-controls="inspector">Evidence &amp; tasks</button>
</div>
<span class="workspace-hint">Follow a function name to navigate · <kbd>/</kbd> search · <kbd>Alt ← / →</kbd> history</span>
<div class="reading-controls" aria-label="Code text size">
<button id="font-smaller" class="button subtle" aria-label="Smaller code text">A−</button>
<output id="font-size">14px</output>
<button id="font-larger" class="button subtle" aria-label="Larger code text">A+</button>
</div>
</div>
<section id="function-pane" class="function-pane">
<div class="pane-head">
<h2>Functions</h2>
<span id="function-count" class="muted"></span>
</div>
<h2 class="tile-title">functions</h2>
<span id="function-count" class="tile-meta"></span>
<div class="function-search">
<input
id="function-search"
Expand All @@ -158,6 +130,7 @@ <h2>Functions</h2>
></div>
</section>
<section class="code-pane">
<h2 class="tile-title">function</h2>
<div class="code-header">
<div>
<div class="eyebrow" id="function-address">
Expand Down Expand Up @@ -228,6 +201,8 @@ <h3>Select a function to begin.</h3>
</div>
</section>
<aside id="inspector" class="inspector" aria-label="Function evidence and related work">
<h2 class="tile-title">context</h2>
<div class="tile-body">
<section>
<div class="eyebrow">FUNCTION CONTEXT</div>
<div id="function-context" class="context">
Expand Down Expand Up @@ -259,7 +234,20 @@ <h3>Select a function to begin.</h3>
Copy command
</button>
</section>
</div>
</aside>
<footer class="workspace-tools" aria-label="Workspace layout">
<span class="workspace-hint"><kbd>/</kbd> search <kbd>alt ←</kbd><kbd>→</kbd> history <kbd>1</kbd><kbd>2</kbd> views <span class="muted">· click a call to follow it</span></span>
<div class="layout-controls">
<button id="toggle-functions" class="toggle" aria-expanded="true" aria-controls="function-pane">functions</button
><button id="toggle-context" class="toggle" aria-expanded="false" aria-controls="inspector">evidence &amp; tasks</button>
</div>
<div class="reading-controls" aria-label="Code text size">
<button id="font-smaller" class="toggle" aria-label="Smaller code text">a−</button>
<output id="font-size">14px</output>
<button id="font-larger" class="toggle" aria-label="Larger code text">a+</button>
</div>
</footer>
</main>
</div>
</div>
Expand Down
42 changes: 16 additions & 26 deletions crates/e5r-cli/src/dashboard/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,24 @@
</head>
<body>
<div class="shell">
<aside class="rail">
<a class="brand" href="/">e5r<span>ANALYSIS WORKSPACE</span></a>
<div class="rail-label">GLOBAL LIBRARY</div>
<div class="project-name">All projects</div>
<nav aria-label="Collection">
<a class="nav selected" href="/">Projects</a>
</nav>
<div class="rail-foot">
<span class="local-dot"></span> LOCAL COLLECTION
<p>Live tasks across your projects.</p>
<small
>Binaries stay in their original locations.<br />Analysis loads when
you open a decompiler.</small
>
<header class="bar">
<div class="bar-left">
<a class="brand" href="/">e5r</a>
<nav aria-label="Collection">
<a class="nav selected" href="/">projects</a>
</nav>
</div>
</aside>
<div class="crumb">
<span>Project collection</span
><span id="storage" class="muted">Reading the library…</span>
</div>
<div class="top-actions">
<span class="local-dot" aria-hidden="true"></span><span class="seg">local</span
><span id="sync" class="seg muted" aria-live="polite">Connecting…</span
><button id="refresh" class="seg seg-button">refresh</button>
</div>
</header>
<div class="body">
<header class="topbar">
<div class="crumb">
<span>Project collection</span
><span id="storage" class="muted">Reading the library…</span>
</div>
<div class="top-actions">
<span id="sync" class="muted" aria-live="polite">Connecting…</span
><button id="refresh" class="button subtle">Refresh</button
>
</div>
</header>
<div id="error" role="alert" hidden></div>
<main class="overview">
<section class="hero">
Expand Down
Loading
Loading