Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2025-01-24 22:01:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

20MB debug log, design changes

Browse Source
This commit is contained in:
creeper123123321 2021-07-27 21:42:26 -03:00
parent 910a0dfe44
commit bf62ba5cb5
4 changed files with 55 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/log4j2.xml
View File

@ -17,7 +17,7 @@
<RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz"> <RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz">
<PatternLayout pattern="%d{yyy-MM-dd HH:mm:ss} [%t] [%logger] %level{length=1} %msg%n"/> <PatternLayout pattern="%d{yyy-MM-dd HH:mm:ss} [%t] [%logger] %level{length=1} %msg%n"/>
<Policies> <Policies>
<SizeBasedTriggeringPolicy size="5 MB"/> <SizeBasedTriggeringPolicy size="20 MB"/>
<OnStartupTriggeringPolicy/> <OnStartupTriggeringPolicy/>
</Policies> </Policies>
<DefaultRolloverStrategy max="2"/> <DefaultRolloverStrategy max="2"/>

104
src/main/resources/web/index.html
View File

@ -34,7 +34,6 @@ frame-ancestors 'self'"
integrity="sha512-UNM1njAgOFUa74Z0bADwAq8gbTcqZC8Ej4xPSzpnh0l6KMevwvkBvbldF9uR++qKeJ+MOZHRjV1HZjoRvjDfNQ==" integrity="sha512-UNM1njAgOFUa74Z0bADwAq8gbTcqZC8Ej4xPSzpnh0l6KMevwvkBvbldF9uR++qKeJ+MOZHRjV1HZjoRvjDfNQ=="
src="https://cdnjs.cloudflare.com/ajax/libs/uuid/8.3.2/uuid.min.js"></script> src="https://cdnjs.cloudflare.com/ajax/libs/uuid/8.3.2/uuid.min.js"></script>
<script src="https://alcdn.msauth.net/browser/2.15.0/js/msal-browser.min.js" integrity="sha384-/weuqUPkC0P9JxnstihEV1GHdWrheU9Qo3MbdTuxxKJM8l/cSTE5zGP5VBIM4TZN" crossorigin="anonymous"></script> <script src="https://alcdn.msauth.net/browser/2.15.0/js/msal-browser.min.js" integrity="sha384-/weuqUPkC0P9JxnstihEV1GHdWrheU9Qo3MbdTuxxKJM8l/cSTE5zGP5VBIM4TZN" crossorigin="anonymous"></script>
<link href="style.css" rel="stylesheet">
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-md navbar-dark bg-dark mb-2"> <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-2">
@ -87,66 +86,44 @@ frame-ancestors 'self'"
<div aria-labelledby="settings-tab" class="tab-pane fade" id="settings"> <div aria-labelledby="settings-tab" class="tab-pane fade" id="settings">
<div class="mb-3"> <div class="mb-3">
<label class="form-label" for="form_cors_proxy"><h5>CORS Proxy URL Prefix</h5></label> <p>See <a href="https://github.com/ViaVersion/VIAaaS/">README</a> for more details.</p>
<p>See <a href="https://github.com/ViaVersion/VIAaaS#cors-proxy">README</a> <form class="input-group" id="form_cors_proxy">
for setting up one. Mojang APIs are called through this proxy, and a remote IP address may look <label class="input-group-text" for="cors-proxy">CORS Proxy URL Prefix</label>
suspicious and block your account. <input class="form-control" id="cors-proxy" placeholder="http://localhost:8080/" type="url">
It will receive sensitive data like email, passwords and tokens. HTTPS is required for non-localhost <button class="btn btn-primary" type="submit">Save</button>
addresses.</p>
<form class="row g-3" id="form_cors_proxy">
<div class="col-auto">
<input class="form-control" id="cors-proxy" placeholder="http://localhost:8080/" type="url">
</div>
<div class="col-auto">
<button class="btn btn-primary" type="submit">Save</button>
</div>
</form> </form>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label class="form-label" for="form_ws_url"><h5>WebSocket URL</h5></label> <form class="input-group" id="form_ws_url">
<p>It exchanges sensitive data like minecraft.id tokens, server session hashes and usernames. WSS is <label class="input-group-text" for="ws-url">WebSocket URL</label>
required.</p> <input class="form-control" id="ws-url" placeholder="wss://viaaas.example.com/ws" type="url">
<form class="row g-3" id="form_ws_url"> <button class="btn btn-primary" type="submit">Save</button>
<div class="col-auto">
<input class="form-control" id="ws-url" placeholder="wss://viaaas.example.com/ws" type="url">
</div>
<div class="col-auto">
<button class="btn btn-primary" type="submit">Save</button>
</div>
</form> </form>
</div> </div>
</div> </div>
<div aria-labelledby="accounts-tab" class="tab-pane fade" id="accounts"> <div aria-labelledby="accounts-tab" class="tab-pane fade" id="accounts">
<div> <div class="mb-3">
<h5>Minecraft accounts</h5> <p class="form-label">Accounts stored in the browser</p>
<p>These accounts are stored in the browser.</p> <ul class="list-group" id="accounts-list"></ul>
<div id="accounts-list"></div>
<hr>
</div> </div>
<div id="add-account"> <div id="add-account">
<label class="mb-3" for="form_add_ms"><h5>Add Microsoft account</h5></label> <div class="mb-3">
<form class="row" id="form_add_ms"> <label class="form-label" for="form_add_ms">Add Microsoft account</label>
<form class="row" id="form_add_ms">
<div class="col-auto"> <div class="col-auto">
<button class="btn btn-primary mb-3" id="login_submit_ms" type="submit">Login with Microsoft <button class="btn btn-primary" id="login_submit_ms" type="submit">Login with Microsoft</button>
</button>
</div> </div>
</form> </form>
<label class="mb-3" for="form_add_mc"><h5>Add Mojang account</h5></label> </div>
<form class="row g-3" id="form_add_mc"> <div class="mb-2">
<div class="col-auto"> <label class="form-label" for="form_add_mc">Add Mojang account</label>
<label class="visually-hidden" for="email">Username/Email</label> <form class="input-group" id="form_add_mc">
<input class="form-control" id="email" name="email" placeholder="mc@example.com" type="text"> <input aria-label="Email/Username" class="form-control" id="email" name="email" placeholder="mc@example.com" type="text">
</div> <input aria-label="Password" class="form-control" id="password" name="password" placeholder="password" type="password">
<div class="col-auto"> <button class="btn btn-primary" id="login_submit_mc" type="submit">Login with Mojang</button>
<label class="visually-hidden" for="password">Password</label> </form>
<input class="form-control" id="password" name="password" placeholder="password" type="password"> </div>
</div>
<div class="col-auto">
<button class="btn btn-primary mb-3" id="login_submit_mc" type="submit">Login with Mojang
</button>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>
@ -159,27 +136,28 @@ frame-ancestors 'self'"
<button aria-label="Close" class="btn-close" data-bs-dismiss="modal" type="button"></button> <button aria-label="Close" class="btn-close" data-bs-dismiss="modal" type="button"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<pre> <!-- Design somewhat stolen/inspired from Gnome -->
\\ // // //\\ => //|| //|| /=====/ <img src="https://cdn.discordapp.com/attachments/316218802155028482/850014925622476820/unknown.png" class="mx-auto d-block" alt="VIAaaS logo" width=150">
\\ // // // \\ // || // || // <div class="text-center mb-3">
\\ // // //====\\ //==|| //==|| \====\ <h5>ViaVersion as a Service</h5>
\\ // // // \\ // || // || // <h6>Standalone ViaVersion Proxy</h6>
<= \\// // // \\ // || // || /====/</pre> </div>
<p>ViaVersion as a Service - Standalone ViaVersion Proxy</p> <div class="text-center mb-3">
<hr> <p class="mb-1">Copyright © 2020-2021 <a href="https://github.com/creeper123123321">creeper123123321</a></p>
<p>Copyright © 2020-2021 <a href="https://github.com/creeper123123321">creeper123123321</a></p> <p class="mb-1">Copyright © 2021 <a href="https://github.com/ViaVersion/VIAaaS/graphs/contributors">contributors</a></p>
<p>Copyright © 2021 <a href="https://github.com/ViaVersion/VIAaaS/graphs/contributors">contributors</a> </div>
</p> <div>
<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU <p>VIAaaS is free software: you can redistribute it and/or modify it under the terms of the GNU
Affero General Public License as published by the Free Software Foundation, either version 3 of the Affero General Public License as published by the Free Software Foundation, either version 3 of the
License, License,
or (at your option) any later version.</p> or (at your option) any later version.</p>
<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without <p>VIAaaS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
General General
Public License for more details.</p> Public License for more details.</p>
<p>You should have received a copy of the GNU Affero General Public License along with this program. If <p>You should have received a copy of the GNU Affero General Public License along with this program. If
not, see <a href="https://gnu.org/licenses">https://gnu.org/licenses/</a>.</p> not, see <a href="https://gnu.org/licenses">https://gnu.org/licenses/</a>.</p>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-secondary" href="https://github.com/ViaVersion/VIAaaS/" role="button" type="button">Source <a class="btn btn-secondary" href="https://github.com/ViaVersion/VIAaaS/" role="button" type="button">Source

18
src/main/resources/web/js/page.js
View File

@ -48,10 +48,16 @@ function refreshCorsStatus() {
} }
function addMcAccountToList(id, name, msUser = null) { function addMcAccountToList(id, name, msUser = null) {
let p = document.createElement("p"); let p = document.createElement("li");
p.className = "input-group d-flex";
let shead = document.createElement("span");
shead.className = "input-group-text";
let head = document.createElement("img"); let head = document.createElement("img");
shead.append(head);
let n = document.createElement("span"); let n = document.createElement("span");
n.className = "form-control";
let remove = document.createElement("a"); let remove = document.createElement("a");
remove.className = "btn btn-danger";
n.innerText = " " + name + " " + (msUser == null ? "" : "(" + msUser + ") "); n.innerText = " " + name + " " + (msUser == null ? "" : "(" + msUser + ") ");
remove.innerText = "Logout"; remove.innerText = "Logout";
remove.href = "javascript:"; remove.href = "javascript:";
@ -62,11 +68,11 @@ function addMcAccountToList(id, name, msUser = null) {
logoutMs(msUser); logoutMs(msUser);
} }
}; };
head.className = "account_head"; head.width = "24";
head.alt = name + "'s head"; head.alt = name + "'s head";
head.src = "https://crafthead.net/helm/" + id; head.src = "https://crafthead.net/helm/" + id;
//(id.length == 36 || id.length == 32) ? "https://crafatar.com/avatars/" + id + "?overlay" : "https://crafthead.net/helm/" + id; //(id.length == 36 || id.length == 32) ? "https://crafatar.com/avatars/" + id + "?overlay" : "https://crafthead.net/helm/" + id;
p.append(head); p.append(shead);
p.append(n); p.append(n);
p.append(remove); p.append(remove);
accounts.appendChild(p); accounts.appendChild(p);
@ -151,7 +157,7 @@ function addListeningList(user) {
listening.removeChild(p); listening.removeChild(p);
unlisten(user); unlisten(user);
}; };
head.className = "account_head"; head.width = "24";
head.alt = user + "'s head"; head.alt = user + "'s head";
head.src = "https://crafthead.net/helm/" + user; head.src = "https://crafthead.net/helm/" + user;
p.append(head); p.append(head);
@ -188,5 +194,7 @@ function resetHtml() {
} }
function ohNo() { function ohNo() {
new Date().getDay() == 3 && console.log("it's snapshot day 🐸 my dudes"); new Date().getDate() == 1 && new Date().getMonth() == 3 && addToast("WARNING", "Your ViaVersion has expired, please renew it at https://viaversion.com/ for $99"); try {
new Date().getDay() == 3 && console.log("it's snapshot day 🐸 my dudes"); new Date().getDate() == 1 && new Date().getMonth() == 3 && addToast("WARNING", "Your ViaVersion has expired, please renew it at https://viaversion.com/ for $99");
} catch (e) { console.log(e); }
} }

3
src/main/resources/web/style.css
View File

@ -1,3 +0,0 @@
.account_head {
width: 24px;
}