Skip to content

Commit dc7d1c6

Browse files
javutojavuto
committed
Show enroll metadata, better flags and random stuff
1 parent bafd208 commit dc7d1c6

32 files changed

+295
-149
lines changed

‎cmd/admin/handlers-get.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,9 @@ func enrollGETHandler(w http.ResponseWriter, r *http.Request) {
809809
QuickRemoveShell: shellQuickRemove,
810810
QuickAddPowershell: powershellQuickAdd,
811811
QuickRemovePowershell: powershellQuickRemove,
812+
Secret: env.Secret,
813+
Flags: env.Flags,
814+
Certificate: env.Certificate,
812815
Environments: envAll,
813816
Platforms: platforms,
814817
TLSDebug: settingsmgr.DebugService(settings.ServiceTLS),
@@ -840,7 +843,8 @@ func nodeHandler(w http.ResponseWriter, r *http.Request) {
840843
}
841844
// Custom functions to handle formatting
842845
funcMap := template.FuncMap{
843-
"pastTimeAgo": pastTimeAgo,
846+
"pastTimeAgo": pastTimeAgo,
847+
"jsonRawIndent": jsonRawIndent,
844848
}
845849
// Prepare template
846850
t, err := template.New("node.html").Funcs(funcMap).ParseFiles(

‎cmd/admin/templates/carves-details.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="card-header">
2525
<i class="fa fas fa-server"></i> Carved files for {{ .Name }}
2626
<div class="card-header-actions">
27-
<button class="btn btn-sm btn-outline-primary" data-toggle="tooltip"
27+
<button class="btn btn-sm btn-outline-primary" data-tooltip="true"
2828
data-placement="bottom" title="Refresh details" onclick="refreshCarveDetails();">
2929
<i class="fas fa-sync-alt"></i>
3030
</button>
@@ -65,13 +65,13 @@
6565
<div class="row">
6666
<div class="col-sm-6 mx-auto">
6767
<button id="download_button" type="button" class="btn btn-sm btn-outline-dark"
68-
data-toggle="tooltip" data-placement="top" title="Download" onclick="downloadCarve({{ $e.SessionID }});">
68+
data-tooltip="true" data-placement="top" title="Download" onclick="downloadCarve({{ $e.SessionID }});">
6969
<i class="fas fa-download"></i>
7070
</button>
7171
</div>
7272
<div class="col-sm-6 mx-auto">
7373
<button type="delete_button" class="btn btn-sm btn-outline-danger"
74-
data-toggle="tooltip" data-placement="top" title="Delete" onclick="confirmDeleteCarve([{{ $e.CarveID }}]);">
74+
data-tooltip="true" data-placement="top" title="Delete" onclick="confirmDeleteCarve([{{ $e.CarveID }}]);">
7575
<i class="far fa-trash-alt"></i>
7676
</button>
7777
</div>
@@ -196,7 +196,7 @@
196196
<script type="text/javascript">
197197
$(document).ready(function() {
198198
// Enable all tooltips
199-
$('[data-toggle="tooltip"]').tooltip({trigger : 'hover'});
199+
$('[data-tooltip="true"]').tooltip({trigger : 'hover'});
200200

201201
// Refresh sidebar stats
202202
beginStats();

‎cmd/admin/templates/carves-run.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@
133133
<div class="row">
134134
<div class="col-sm-6 mx-auto">
135135
<button id="carve_button" type="button" class="btn btn-sm btn-outline-dark"
136-
data-toggle="tooltip" data-placement="top" title="Carve file/directory" onclick="sendCarve();">
136+
data-tooltip="true" data-placement="top" title="Carve file/directory" onclick="sendCarve();">
137137
<i class="fas fa-file-upload"></i> Carve
138138
</button>
139139
</div>
140140
<div class="col-sm-6 mx-auto">
141141
<button type="button" class="btn btn-sm btn-outline-danger"
142-
data-toggle="tooltip" data-placement="top" title="Clear file/directory" onclick="clearCarve();">
142+
data-tooltip="true" data-placement="top" title="Clear file/directory" onclick="clearCarve();">
143143
<i class="fas fa-eraser"></i> Clear
144144
</button>
145145
</div>
@@ -215,7 +215,7 @@
215215
});
216216

217217
// Enable all tooltips
218-
$('[data-toggle="tooltip"]').tooltip({trigger : 'hover'});
218+
$('[data-tooltip="true"]').tooltip({trigger : 'hover'});
219219

220220
// Filter tables by input
221221
$('#filter-tables').keyup(function () {

‎cmd/admin/templates/carves.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-header">
2222
<i class="nav-icon fas fa-terminal"></i> {{ .Title }}
2323
<div class="card-header-actions">
24-
<button class="btn btn-sm btn-outline-primary" data-toggle="tooltip"
24+
<button class="btn btn-sm btn-outline-primary" data-tooltip="true"
2525
data-placement="bottom" title="Refresh table" onclick="refreshTableNow('tableCarves');">
2626
<i class="fas fa-sync-alt"></i>
2727
</button>
@@ -215,7 +215,7 @@
215215
});
216216

217217
// Enable all tooltips
218-
$('[data-toggle="tooltip"]').tooltip({trigger : 'hover'});
218+
$('[data-tooltip="true"]').tooltip({trigger : 'hover'});
219219

220220
// Auto-refresh table
221221
setInterval(function (){

‎cmd/admin/templates/conf.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="card-header-actions">
2424
<div class="card-header-action">
2525
<button id="intervals_save" class="btn btn-sm btn-block btn-dark"
26-
data-toggle="tooltip" data-placement="bottom" title="Save Intervals" onclick="saveIntervals();">
26+
data-tooltip="true" data-placement="bottom" title="Save Intervals" onclick="saveIntervals();">
2727
<i class="far fa-save"></i>
2828
</button>
2929
</div>
@@ -72,7 +72,7 @@
7272
<div class="card-header-actions">
7373
<div class="card-header-action">
7474
<button id="json_save" class="btn btn-sm btn-block btn-dark"
75-
data-toggle="tooltip" data-placement="bottom" title="Save Changes" onclick="saveConfiguration();">
75+
data-tooltip="true" data-placement="bottom" title="Save Changes" onclick="saveConfiguration();">
7676
<i class="far fa-save"></i>
7777
</button>
7878
</div>
@@ -154,7 +154,7 @@
154154
editorConf.setSize("100%", "100%");
155155

156156
// Enable all tooltips
157-
$('[data-toggle="tooltip"]').tooltip({trigger : 'hover'});
157+
$('[data-tooltip="true"]').tooltip({trigger : 'hover'});
158158

159159
// Refresh sidebar stats
160160
beginStats();

‎cmd/admin/templates/enroll.html‎

Lines changed: 109 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
{{ if not .EnrollExpired }}
2828
<div class="card-header-action mr-3">
2929
<button id="enroll_expire" class="btn btn-sm btn-block btn-danger"
30-
data-toggle="tooltip" data-placement="bottom" title="Expire" onclick="expireEnrollLink();">
30+
data-tooltip="true" data-placement="bottom" title="Expire" onclick="expireEnrollLink();">
3131
<i class="far fa-times-circle"></i>
3232
</button>
3333
</div>
3434
{{ end }}
3535
{{ if .EnrollExpired }}
3636
<div class="card-header-action mr-3">
3737
<button id="enroll_extend" class="btn btn-sm btn-block btn-success"
38-
data-toggle="tooltip" data-placement="bottom" title="Extend 24 hours" onclick="extendEnrollLink();">
38+
data-tooltip="true" data-placement="bottom" title="Extend 24 hours" onclick="extendEnrollLink();">
3939
<i class="far fa-clock"></i>
4040
</button>
4141
</div>
@@ -67,6 +67,8 @@
6767

6868
</div>
6969

70+
<hr>
71+
7072
<div class="row mb-4">
7173
<div class="col-md-12">
7274
Run this command in Windows to quickly add nodes in the environment {{ .EnvName }}. It will install osquery in the system:
@@ -98,15 +100,15 @@
98100
{{ if not .RemoveExpired }}
99101
<div class="card-header-action mr-3">
100102
<button id="remove_expire" class="btn btn-sm btn-block btn-danger"
101-
data-toggle="tooltip" data-placement="bottom" title="Expire" onclick="expireRemoveLink();">
103+
data-tooltip="true" data-placement="bottom" title="Expire" onclick="expireRemoveLink();">
102104
<i class="far fa-times-circle"></i>
103105
</button>
104106
</div>
105107
{{ end }}
106108
{{ if .RemoveExpired }}
107109
<div class="card-header-action mr-3">
108110
<button id="remove_extend" class="btn btn-sm btn-block btn-success"
109-
data-toggle="tooltip" data-placement="bottom" title="Extend 24 hours" onclick="extendRemoveLink();">
111+
data-tooltip="true" data-placement="bottom" title="Extend 24 hours" onclick="extendRemoveLink();">
110112
<i class="far fa-clock"></i>
111113
</button>
112114
</div>
@@ -136,6 +138,8 @@
136138
</div>
137139
</div>
138140

141+
<hr>
142+
139143
<div class="row mb-4">
140144
<div class="col-md-12">
141145
Run this command in Windows to quickly <span style="color:red;">remove</span> nodes in the environment {{ .EnvName }}. It will NOT remove osquery from the system:
@@ -157,6 +161,87 @@
157161
</div>
158162
</div>
159163

164+
<div class="card mt-2">
165+
<div class="card-header">
166+
<i class="fas fa-key"></i> Values to manually enroll nodes for environment <b>{{ .EnvName }}</b>
167+
<div class="card-header-actions">
168+
169+
<div class="row">
170+
<div class="card-header-action mr-3">
171+
<button id="show_values" class="btn btn-sm btn-block btn-info"
172+
data-placement="bottom" title="Show values" data-tooltip="true"
173+
data-toggle="collapse" data-target=".manual-values">
174+
<i class="far fa-eye"></i>
175+
</button>
176+
</div>
177+
</div>
178+
179+
</div>
180+
</div>
181+
<div class="card-body collapse manual-values">
182+
183+
<div class="row mb-4">
184+
<div class="col-md-12">
185+
Enrollment secret:
186+
</div>
187+
</div>
188+
<div class="row mb-4">
189+
<div class="col-md-12">
190+
<button id="button-clipboard-values" class="btn-sm btn-clipboard mr-2" data-clipboard-action="copy" data-clipboard-target="#enroll-secret">
191+
Copy
192+
</button>
193+
<div class="highlight">
194+
<code id="enroll-secret">
195+
{{ .Secret }}
196+
</code>
197+
</div>
198+
</div>
199+
</div>
200+
201+
<hr>
202+
203+
<div class="row mb-4">
204+
<div class="col-md-12">
205+
Enrollment flags for osquery:
206+
</div>
207+
</div>
208+
<div class="row mb-4">
209+
<div class="col-md-12">
210+
<button id="button-clipboard-values" class="btn-sm btn-clipboard mr-2" data-clipboard-action="copy" data-clipboard-target="#enroll-flags">
211+
Copy
212+
</button>
213+
<div class="highlight">
214+
<pre id="enroll-flags">{{ .Flags }}</pre>
215+
</div>
216+
</div>
217+
</div>
218+
<div class="row mb-4">
219+
<div class="col-md-12">
220+
<b>Note:</b> Secret and certificate path need to be changed.
221+
</div>
222+
</div>
223+
224+
<hr>
225+
226+
<div class="row mb-4">
227+
<div class="col-md-12">
228+
Enrollment certificate:
229+
</div>
230+
</div>
231+
<div class="row mb-4">
232+
<div class="col-md-12">
233+
<button id="button-clipboard-values" class="btn-sm btn-clipboard mr-2" data-clipboard-action="copy" data-clipboard-target="#enroll-cert">
234+
Copy
235+
</button>
236+
<div class="highlight">
237+
<pre id="enroll-cert">{{ .Certificate }}</pre>
238+
</div>
239+
</div>
240+
</div>
241+
242+
</div>
243+
</div>
244+
160245
{{ template "page-modals" . }}
161246

162247
</div>
@@ -181,9 +266,12 @@
181266
$('code').each(function(i, block) {
182267
hljs.highlightBlock(block);
183268
});
269+
$('pre').each(function(i, block) {
270+
hljs.highlightBlock(block);
271+
});
184272

185273
// Enable all tooltips
186-
$('[data-toggle="tooltip"]').tooltip({trigger : 'hover'});
274+
$('[data-tooltip="true"]').tooltip({trigger : 'hover'});
187275

188276
// Clipboard.js initialization
189277
var clipboard_sh = new ClipboardJS('#button-clipboard-sh');
@@ -218,6 +306,22 @@
218306
console.error('Action:', e.action);
219307
console.error('Trigger:', e.trigger);
220308
});
309+
var clipboard_values = new ClipboardJS('#button-clipboard-values');
310+
clipboard_values.on('success', function(e) {
311+
console.info('Action:', e.action);
312+
console.info('Text:', e.text);
313+
console.info('Trigger:', e.trigger);
314+
$(e.trigger).text('Copied!');
315+
e.clearSelection();
316+
setTimeout(function() {
317+
$(e.trigger).text('Copy');
318+
}, 2500);
319+
});
320+
clipboard_values.on('error', function(e) {
321+
$(e.trigger).text('Error');
322+
console.error('Action:', e.action);
323+
console.error('Trigger:', e.trigger);
324+
});
221325

222326
// Refresh sidebar stats
223327
beginStats();

‎cmd/admin/templates/environments.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="row">
2727
<div class="card-header-action mr-3">
2828
<button id="environment_add" class="btn btn-sm btn-block btn-dark"
29-
data-toggle="tooltip" data-placement="bottom" title="Add Environment" onclick="createEnvironment();">
29+
data-tooltip="true" data-placement="bottom" title="Add Environment" onclick="createEnvironment();">
3030
<i class="fas fa-plus"></i>
3131
</button>
3232
</div>
@@ -147,7 +147,7 @@ <h4 class="modal-title">Create new environment</h4>
147147
});
148148

149149
// Enable all tooltips
150-
$('[data-toggle="tooltip"]').tooltip({trigger : 'hover'});
150+
$('[data-tooltip="true"]').tooltip({trigger : 'hover'});
151151

152152
// Refresh sidebar stats
153153
beginStats();

‎cmd/admin/templates/login.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<body class="app flex-row align-items-center">
77
<div class="container">
8-
<div class="row justify-content-center mt-5">
8+
<div class="row justify-content-center">
99
<div class="col-10 col-sm-10 col-md-8 col-lg-6 col-xl-6">
1010
<div class="text-center img-container">
1111
<img src="/static/img/logo.png" class="img-fluid img-logo" alt="Logo">

0 commit comments

Comments
 (0)