Skip to content
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

Jump to bottom

Address Vulnerabilities in Admin Portal v1/v2 #2530

Merged
merged 2 commits into from
Nov 10, 2022
Merged

Address Vulnerabilities in Admin Portal v1/v2 #2530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8541a83
Updated ALL npm packages to latest for admin portal v1/v2. Updated v1…
carlowisse Nov 9, 2022
9c12680
rebase master
carlowisse Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 36 additions & 36 deletions pkg/portal/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 18 additions & 20 deletions portal/v1/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,32 @@
</head>

<body>
<div class="navbar navbar-light bg-light shadow-sm">
<div class="navbar-brand">
<strong>ARO SRE portal ({{ .location }})</strong>
</div>
<div>
<a href="v2" class="btn btn-secondary" id="btnV2">Try Admin Portal V2</a>
<button class="btn btn-secondary" id="btnLogout">Logout</button>
<div class="navbar bg-light shadow-sm">
<div class="container-fluid">
<div class="navbar-brand">
<strong>ARO SRE portal ({{ .location }})</strong>
</div>
<div>
<a href="v2" class="btn btn-secondary" id="btnV2">Try Admin Portal V2</a>
<button class="btn btn-secondary" id="btnLogout">Logout</button>
</div>
</div>
</div>

<div class="container py-4">
<div class="form-group">
<label for="selResourceId">Cluster:</label>
<div class="col-sm-10">
<select data-live-search="true" class="form-control form-control-sm" id="selResourceId">
<label for="selResourceId" class="form-label">Cluster:</label>
<div class="mb-3">
<select data-live-search="true" class="form-select" id="selResourceId">
</select>
</div>
</div>

<div class="form-group">
<label for="selMaster">Master:</label>
<div class="col-sm-10">
<select class="form-control form-control-sm" id="selMaster">
<option value="0">master-0</option>
<label for="selMaster" class="form-label">Master:</label>
<div class="mb-3">
<select class="form-select" id="selMaster">
<option value="0" selected>master-0</option>
<option value="1">master-1</option>
<option value="2">master-2</option>
</select>
Expand Down Expand Up @@ -70,18 +72,14 @@
</button>
<span data-copy="password">Password: <code></code></span>
</div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
</template>

<template id="tmplSSHAlertError">
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<span data-copy="error"></span>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion portal/v1/build/main.js
View file
Open in desktop

Large diffs are not rendered by default.

88 changes: 52 additions & 36 deletions portal/v1/build/main.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,62 @@
/*!
* Bootstrap dropdown.js v4.6.1 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Bootstrap alert.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap util.js v4.6.1 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Bootstrap base-component.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
*
* Copyright 2012-2020 SnapAppointments, LLC
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
*/
* Bootstrap component-functions.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap config.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap data.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap dropdown.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap event-handler.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap index.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap manipulator.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Bootstrap selector-engine.js v5.2.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*!
* Sizzle CSS Selector Engine v2.3.6
Expand All @@ -29,7 +70,7 @@
*/

/*!
* jQuery JavaScript Library v3.6.0
* jQuery JavaScript Library v3.6.1
* https://jquery.com/
*
* Includes Sizzle.js
Expand All @@ -39,30 +80,5 @@
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2021-03-02T17:08Z
*/

/**!
* @fileOverview Kickass library to create and place poppers near their reference elements.
* @version 1.16.1
* @license
* Copyright (c) 2016 Federico Zivolo and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* Date: 2022-08-26T17:52Z
*/
16 changes: 5 additions & 11 deletions portal/v1/build/styles.css
View file
Open in desktop

Large diffs are not rendered by default.