ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Superuser page access over P2P

disk-divisor
Moe 2022-10-25 09:17:44 -07:00
parent 35b54db091
commit 6b28a3d422
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/assets/js/super.easyRemoteAccess.js
View File

@ -40,7 +40,7 @@ $(document).ready(function(){
var connectedUsers = cardEl.find('.connectedUsers')
var registeredServers = cardEl.find('.registeredServers')
var chartPort = server.v2 ? server.chartPort || parseInt(server.webPort) + 2 : server.p2pPort
var socketConnection = io(`ws://${server.host}:${chartPort}`,{
var socketConnection = io(`wss://${server.host}:${chartPort == 80 ? 443 : chartPort}`,{
transports: ['websocket'],
query: {
charts: '1'
@ -164,7 +164,7 @@ $(document).ready(function(){
var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
console.log(selectedServer,currentlySelectedP2PServerId,p2pServerList)
if(selectedServer && selectedServer.host){
var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}/${window.useBetterP2P ? '' : '?p2p=1'}`
var href = `https://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}/${window.useBetterP2P ? '' : '?p2p=1'}`
copyToClipboard(href)
new PNotify({
type: 'success',

20
web/pages/super.ejs
View File

@ -2,7 +2,10 @@
<html lang="en">
<head>
<title><%-lang.Superuser%> - <%-lang.Shinobi%></title>
<% window.libURL = originalURL + global.s.checkCorrectPathEnding(config.webPaths.super) %>
<%
if(config.baseURL)window.libURL = config.baseURL;
if(!window.libURL)window.libURL = originalURL;
%>
<% include blocks/header-meta.ejs %>
<% include blocks/header-favicon.ejs %>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@ -27,7 +30,7 @@
<script src="<%-window.libURL%>assets/js/bs5.confirm.js" type="text/javascript"></script>
<script>
var superApiPrefix = location.search === '?p2p=1' ? (location.pathname.endsWith('/') ? location.pathname : location.pathname) : "<%=originalURL%><%=config.webPaths.superApiPrefix%>"
var superApiPrefix = location.pathname.indexOf('/s/') > -1 ? (location.pathname.endsWith('/') ? location.pathname : location.pathname + '/') : "<%- `${originalURL}${config.webPaths.superApiPrefix}` %>"
</script>
<% customAutoLoad.superLibsCss.forEach(function(lib){ %>
<link rel="stylesheet" href="<%-window.libURL%>libs/css/<%-lib%>">
@ -215,15 +218,10 @@ switch($user.lang){
})
break;
}
if(location.search === '?p2p=1'){
$.ccio.ws=io(location.origin,{
path : '/socket.io'
});
}else{
$.ccio.ws=io(location.origin,{
path : tool.checkCorrectPathEnding(location.pathname)+'socket.io'
});
}
$.ccio.ws = io(`${location.origin.split('/super')[0]}/`,{
path : tool.checkCorrectPathEnding(location.pathname)+'socket.io'
});
$.ccio.cx=function(x){return $.ccio.ws.emit('super',x)}
$.ccio.ws.on('connect',function(d){
$.ccio.cx({f:'init',mail:$user.mail,pass:$user.pass,machineId: `<%- config.machineId %>`})