fatchan
/
haproxy-panel-next
mirror of https://gitgud.io/fatchan/haproxy-panel-next.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update haproxy-sdk to new version with small failsafe for illegal commands

Browse Source 
Reenable custom backend mapping to show backend server names
Minor formatting fixes
develop
Your Name 2 years ago
parent cf3176f811
commit f4cbb8ccb0
9 changed files with 36 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Dockerfile
  2. 2
      api.js
  3. 1
      controllers/maps.js
  4. 14
      package-lock.json
  5. 2
      package.json
  6. 6
      pages/account.js
  7. 12
      pages/map/[name].js
  8. 19
      router.js
  9. 4
      util.js

1
Dockerfile
Unescape View File

@ -9,7 +9,6 @@ RUN npm install --production
COPY .env /opt/.env COPY .env /opt/.env
COPY . /opt COPY . /opt
COPY ./node_modules/@fatchan/haproxy-sdk/lib/_utils.js /opt/node_modules/@fatchan/haproxy-sdk/lib/_utils.js
RUN npm run build RUN npm run build

2
api.js
Unescape View File

@ -20,7 +20,7 @@ function buildOptions(route, method, body) {
export default async function ApiCall(route, method='get', body, stateCallback, errorCallback, finishProgress, router) { export default async function ApiCall(route, method='get', body, stateCallback, errorCallback, finishProgress, router) {
// Start progress bar // Start progress bar
NProgress.start(); NProgress.start();
// Build request options for fetch // Build request options for fetch
const requestOptions = buildOptions(route, method, body); const requestOptions = buildOptions(route, method, body);

1
controllers/maps.js
Unescape View File

@ -23,6 +23,7 @@ exports.mapData = async (req, res, next) => {
switch (req.params.name) { switch (req.params.name) {
case process.env.DDOS_MAP_NAME: case process.env.DDOS_MAP_NAME:
showValues = true; showValues = true;
case process.env.BACKENDS_MAP_NAME:
case process.env.HOSTS_MAP_NAME: case process.env.HOSTS_MAP_NAME:
if (process.env.CUSTOM_BACKENDS_ENABLED) { if (process.env.CUSTOM_BACKENDS_ENABLED) {
showValues = true; showValues = true;

14
package-lock.json generated
Unescape View File

@ -9,7 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"@fatchan/haproxy-sdk": "^1.0.5", "@fatchan/haproxy-sdk": "^1.0.6",
"bcrypt": "^5.0.1", "bcrypt": "^5.0.1",
"body-parser": "^1.20.0", "body-parser": "^1.20.0",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
@ -102,9 +102,9 @@
"dev": true "dev": true
}, },
"node_modules/@fatchan/haproxy-sdk": { "node_modules/@fatchan/haproxy-sdk": {
"version": "1.0.5", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/@fatchan/haproxy-sdk/-/haproxy-sdk-1.0.5.tgz", "resolved": "https://registry.npmjs.org/@fatchan/haproxy-sdk/-/haproxy-sdk-1.0.6.tgz",
"integrity": "sha512-O0NzzpAwOcJDKUgvkaGIxvXn+uozpAWbT1lncFEX5MGoJ/HmKGQCtARStQNk/d//Q1gm4ILiOmLa9XcJRq+cbQ==", "integrity": "sha512-VJbQGtGuxNhpcmYQI9kXAKHpmWXqQ9hs0K+GzIDG7pJ2dwBwaDf71hcezvehFhgmQMqD7dDMZG+1QkMCJDbiMA==",
"engines": { "engines": {
"node": ">=8.15.1", "node": ">=8.15.1",
"npm": ">=6.4.1" "npm": ">=6.4.1"
@ -8010,9 +8010,9 @@
} }
}, },
"@fatchan/haproxy-sdk": { "@fatchan/haproxy-sdk": {
"version": "1.0.5", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/@fatchan/haproxy-sdk/-/haproxy-sdk-1.0.5.tgz", "resolved": "https://registry.npmjs.org/@fatchan/haproxy-sdk/-/haproxy-sdk-1.0.6.tgz",
"integrity": "sha512-O0NzzpAwOcJDKUgvkaGIxvXn+uozpAWbT1lncFEX5MGoJ/HmKGQCtARStQNk/d//Q1gm4ILiOmLa9XcJRq+cbQ==" "integrity": "sha512-VJbQGtGuxNhpcmYQI9kXAKHpmWXqQ9hs0K+GzIDG7pJ2dwBwaDf71hcezvehFhgmQMqD7dDMZG+1QkMCJDbiMA=="
}, },
"@humanwhocodes/config-array": { "@humanwhocodes/config-array": {
"version": "0.9.5", "version": "0.9.5",

2
package.json
Unescape View File

@ -13,7 +13,7 @@
"author": "Thomas Lynch (fatchan) <tom@69420.me>", "author": "Thomas Lynch (fatchan) <tom@69420.me>",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"@fatchan/haproxy-sdk": "^1.0.5", "@fatchan/haproxy-sdk": "^1.0.6",
"bcrypt": "^5.0.1", "bcrypt": "^5.0.1",
"body-parser": "^1.20.0", "body-parser": "^1.20.0",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",

6
pages/account.js
Unescape View File

@ -92,10 +92,10 @@ const Account = (props) => {
<div className="d-flex w-100 justify-content-between mt-2"> <div className="d-flex w-100 justify-content-between mt-2">
<div className="ms-2"> <div className="ms-2">
<div className="fw-bold"> <div className="fw-bold">
Servers ({user.clusters[user.activeCluster].split(',').length}) Servers ({user.clusters.length === 0 ? 0 : user.clusters[user.activeCluster].split(',').length})
<span className="fw-normal"> {user.clusters.length > 0 && (<span className="fw-normal">
: {user.clusters[user.activeCluster].split(',').map(x => x.substring(0, x.length/2)+'...').join(', ')} : {user.clusters[user.activeCluster].split(',').map(x => x.substring(0, x.length/2)+'...').join(', ')}
</span> </span>)}
</div> </div>
</div> </div>
<span className="ml-auto d-flex flex-row"> <span className="ml-auto d-flex flex-row">

12
pages/map/[name].js
Unescape View File

@ -10,7 +10,7 @@ import ApiCall from '../../api.js';
const MapPage = (props) => { const MapPage = (props) => {
const router = useRouter(); const router = useRouter();
const { name: mapName } = router.query; const { name: mapName } = router.query;
const [mapData, setMapData] = useState(props); const [mapData, setMapData] = useState(props);
@ -94,6 +94,16 @@ const MapPage = (props) => {
<option selected /> <option selected />
{domainSelectOptions} {domainSelectOptions}
</select> </select>
{
(process.env.NEXT_PUBLIC_CUSTOM_BACKENDS_ENABLED && mapId.name === "hosts") &&
<input
className="form-control ml-2"
type="text"
name="value"
placeholder="backend ip:port"
required
/>
}
</> </>
); );
break; break;

19
router.js
Unescape View File

@ -17,16 +17,16 @@ const testRouter = (server, app) => {
rolling: true, rolling: true,
cookie: { cookie: {
httpOnly: true, httpOnly: true,
secure: false, //!dev, //TODO: check https secure: true, //!dev, //TODO: check https
sameSite: 'strict', sameSite: 'strict',
maxAge: 1000 * 60 * 60 * 24 * 7, //week maxAge: 1000 * 60 * 60 * 24 * 30, //month
} }
}); });
const useSession = (req, res, next) => { const useSession = (req, res, next) => {
sessionStore(req, res, next); sessionStore(req, res, next);
}; };
const fetchSession = async (req, res, next) => { const fetchSession = async (req, res, next) => {
if (req.session.user) { if (req.session.user) {
const account = await db.db.collection('accounts').findOne({_id:req.session.user}); const account = await db.db.collection('accounts').findOne({_id:req.session.user});
@ -43,14 +43,14 @@ const testRouter = (server, app) => {
} }
next(); next();
}; };
const checkSession = (req, res, next) => { const checkSession = (req, res, next) => {
if (!res.locals.user) { if (!res.locals.user) {
return dynamicResponse(req, res, 302, { redirect: '/login' }); return dynamicResponse(req, res, 302, { redirect: '/login' });
} }
next(); next();
}; };
const csrfMiddleware = csrf(); const csrfMiddleware = csrf();
//HAProxy-sdk middleware //HAProxy-sdk middleware
@ -70,7 +70,8 @@ const testRouter = (server, app) => {
}; };
const hasCluster = (req, res, next) => { const hasCluster = (req, res, next) => {
if (res.locals.user.clusters.length > 0) { console.log(req.path)
if (res.locals.user.clusters.length > 0 || (req.baseUrl+req.path) === '/forms/cluster/add') {
return next(); return next();
} }
return dynamicResponse(req, res, 302, { redirect: '/clusters' }); return dynamicResponse(req, res, 302, { redirect: '/clusters' });
@ -93,7 +94,7 @@ const testRouter = (server, app) => {
server.post('/forms/register', useSession, accountController.register); server.post('/forms/register', useSession, accountController.register);
const mapNames = [process.env.BLOCKED_MAP_NAME, process.env.MAINTENANCE_MAP_NAME, process.env.WHITELIST_MAP_NAME, const mapNames = [process.env.BLOCKED_MAP_NAME, process.env.MAINTENANCE_MAP_NAME, process.env.WHITELIST_MAP_NAME,
process.env.BLOCKED_MAP_NAME, process.env.DDOS_MAP_NAME, process.env.HOSTS_MAP_NAME] process.env.BACKENDS_MAP_NAME, process.env.DDOS_MAP_NAME, process.env.HOSTS_MAP_NAME]
, mapNamesOrString = mapNames.join('|'); , mapNamesOrString = mapNames.join('|');
//authed pages that dont require a cluster //authed pages that dont require a cluster
@ -102,7 +103,7 @@ const testRouter = (server, app) => {
server.get(`/map/:name(${mapNamesOrString})`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.mapPage.bind(null, app)); server.get(`/map/:name(${mapNamesOrString})`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.mapPage.bind(null, app));
server.get(`/map/:name(${mapNamesOrString}).json`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.mapJson); server.get(`/map/:name(${mapNamesOrString}).json`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.mapJson);
server.get('/clusters', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, clustersController.clustersPage.bind(null, app)); server.get('/clusters', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, clustersController.clustersPage.bind(null, app));
server.get('/clusters.json', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, clustersController.clustersJson); server.get('/clusters.json', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, clustersController.clustersJson);

4
util.js
Unescape View File

@ -32,11 +32,11 @@ const fMap = {
columnNames: ['Domain', ''], columnNames: ['Domain', ''],
}, },
/*[process.env.BACKENDS_MAP_NAME]: { [process.env.BACKENDS_MAP_NAME]: {
fname: 'Domain Backend Mappings', fname: 'Domain Backend Mappings',
description: 'Which internal server haproxy uses for domains', description: 'Which internal server haproxy uses for domains',
columnNames: ['Domain', 'Server Name'], columnNames: ['Domain', 'Server Name'],
},*/ },
}; };

Write Preview
Loading…
Cancel
Save