commit
cf6400c8d1
13 changed files with 831 additions and 0 deletions
Unified View
Diff Options
-
47build_docker_portal-srv.sh
-
28docker/portal-srv/Dockerfile
-
20src/portal-srv/config.js
-
41src/portal-srv/genCfg.js
-
125src/portal-srv/index.js
-
392src/portal-srv/package-lock.json
-
17src/portal-srv/package.json
-
80src/portal-srv/template/dnsmasq.tmpl.conf
-
22src/portal-srv/template/nginx.tmpl.conf
-
12src/portal-srv/webapp/default/generate_204
-
12src/portal-srv/webapp/default/index.html
-
15src/portal-srv/webapp/portal/index.html
-
20src/portal-srv/webapp/portal/ready.html
@ -0,0 +1,47 @@ |
|||||
|
#!/bin/sh |
||||
|
|
||||
|
# Move in temporary folder |
||||
|
TEMPDIR="/tmp/pxcom-servers/pxportal-srv-build" |
||||
|
rm -rf $TEMPDIR |
||||
|
mkdir -p $TEMPDIR |
||||
|
cd $TEMPDIR |
||||
|
|
||||
|
echo "################################################" |
||||
|
echo "Building solution ..." |
||||
|
echo "################################################" |
||||
|
echo "\n 1- PXOffload\n" |
||||
|
|
||||
|
ROOT_REL_PATH=PXPortal |
||||
|
git clone "ssh://gitolite@tuleap.pxcom.aero/pxcom-servers/PXPortal.git" || exit |
||||
|
|
||||
|
cd $ROOT_REL_PATH |
||||
|
# retrieve version number |
||||
|
numVersion=$(cat ./src/package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[[:space:]]') |
||||
|
|
||||
|
echo $TEMPDIR/$ROOT_REL_PATH |
||||
|
echo "The current PXPortal service version is "$numVersion |
||||
|
read -p "Continue? " dummy |
||||
|
|
||||
|
docker build --rm -f Dockerfile -t registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:$numVersion . |
||||
|
docker tag registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:$numVersion registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:latest |
||||
|
|
||||
|
cd .. |
||||
|
rm -rf PXCom-offload |
||||
|
|
||||
|
echo "\n################################################" |
||||
|
echo "\n 2- Pushing to registry\n" |
||||
|
|
||||
|
docker login http://registry.preprod.pxcom.aero -u pxcom -p PXCom2018 |
||||
|
|
||||
|
docker push registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:$numVersion |
||||
|
docker push registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:latest |
||||
|
|
||||
|
docker logout http://registry.preprod.pxcom.aero |
||||
|
|
||||
|
docker rmi registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:$numVersion |
||||
|
docker rmi registry.preprod.pxcom.aero/pxcom-servers/pxportal-srv:latest |
||||
|
|
||||
|
echo "################################################" |
||||
|
echo "\nBuild done\n" |
||||
|
echo "################################################" |
||||
|
|
||||
@ -0,0 +1,28 @@ |
|||||
|
# build static files |
||||
|
FROM node:carbon-alpine as build-pxportal |
||||
|
WORKDIR /usr/src/app |
||||
|
|
||||
|
COPY src/portal-srv/package*.json ./ |
||||
|
|
||||
|
# RUN ls -l |
||||
|
|
||||
|
RUN npm install |
||||
|
|
||||
|
COPY src/portal-srv/ . |
||||
|
|
||||
|
# final image |
||||
|
FROM node:carbon-alpine |
||||
|
|
||||
|
## install bash |
||||
|
#RUN apk add bash docker |
||||
|
|
||||
|
WORKDIR /usr/app |
||||
|
|
||||
|
# pkg not working in docker |
||||
|
COPY --from=build-pxportal /usr/src/app/ . |
||||
|
|
||||
|
|
||||
|
EXPOSE 8889 |
||||
|
|
||||
|
ENTRYPOINT ["node", "index.js"] |
||||
|
|
||||
@ -0,0 +1,20 @@ |
|||||
|
const path = require('path') |
||||
|
|
||||
|
const CFG = { |
||||
|
port: process.env.PORT || 8889, |
||||
|
arpCmd: process.env.ARP_CMD || 'arp -n', |
||||
|
redirectTo: process.env.REDIRECT_TO || 'http://eca.aero', |
||||
|
webapp: { |
||||
|
home: process.env.WEBAPP_HOME || path.join(__dirname, './webapp/default'), |
||||
|
portal: process.env.WEBAPP_PORTAL || path.join(__dirname, './webapp/portal'), |
||||
|
}, |
||||
|
quiet: process.env.QUIET || false, |
||||
|
domains: [ |
||||
|
'apple.com', |
||||
|
'google.com', |
||||
|
'gstatic.com' |
||||
|
] |
||||
|
} |
||||
|
|
||||
|
|
||||
|
module.exports = CFG |
||||
@ -0,0 +1,41 @@ |
|||||
|
const fs = require('fs') |
||||
|
const hostname = process.argv[2] |
||||
|
const hostIp = process.argv[3] || '192.168.0.2' |
||||
|
const CFG = require('./config') |
||||
|
|
||||
|
if (!hostname) { |
||||
|
console.error(`[!] Missing hostname`) |
||||
|
process.exit(1) |
||||
|
} |
||||
|
|
||||
|
console.log('### nginx conf') |
||||
|
|
||||
|
try { |
||||
|
let nginxCfg = fs.readFileSync('./template/nginx.template', 'utf8') |
||||
|
nginxCfg = nginxCfg |
||||
|
.replace(/@@PORT@@/g, CFG.port) |
||||
|
.replace(/@@HOST@@/g, hostname) |
||||
|
.replace(/@@WEBAPP_HOME@@/g, CFG.webapp.home) |
||||
|
.replace(/@@WEBAPP_PORTAL@@/g, CFG.webapp.home) |
||||
|
.replace(/@@DOMAINS@@/g, CFG.domains.map(val => `*.${val}`).join('\n')) |
||||
|
console.log(nginxCfg) |
||||
|
} catch (e) { |
||||
|
console.error(e) |
||||
|
} |
||||
|
|
||||
|
console.log('\n### dnsmasq conf') |
||||
|
try { |
||||
|
let dnsmasqCfg = fs.readFileSync('./template/dnsmasq.tmpl.conf', 'utf8') |
||||
|
let domains = [] |
||||
|
CFG.domains.forEach(function (val) { |
||||
|
domains.push(`address=/${val}/${hostIp}`) |
||||
|
domains.push(`address=/.${val}/${hostIp}`) |
||||
|
}) |
||||
|
dnsmasqCfg = dnsmasqCfg |
||||
|
.replace(/@@PORT@@/g, CFG.port) |
||||
|
.replace(/@@HOST@@/g, hostname) |
||||
|
.replace(/@@DOMAINS@@/g, domains.join('\n')) |
||||
|
console.log(dnsmasqCfg) |
||||
|
} catch (e) { |
||||
|
console.error(e) |
||||
|
} |
||||
@ -0,0 +1,125 @@ |
|||||
|
const express = require('express') |
||||
|
const app = express() |
||||
|
|
||||
|
const exec = require('child_process').exec |
||||
|
const requestIp = require('request-ip') |
||||
|
|
||||
|
require('colors') |
||||
|
|
||||
|
const ByMac = {} |
||||
|
const ByIp = {} |
||||
|
|
||||
|
const CFG = require('./config') |
||||
|
|
||||
|
app.use(function (req, res, next) { |
||||
|
res.set('Access-Control-Allow-Origin', '*') |
||||
|
res.set('Access-Control-Allow-Methods', '*') |
||||
|
res.set('Access-Control-Allow-Headers', '*') |
||||
|
|
||||
|
if (req.method === 'OPTIONS') { |
||||
|
return res.status(200).send() |
||||
|
} |
||||
|
|
||||
|
req.clientIp = requestIp.getClientIp(req).split(':').slice(-1).pop() |
||||
|
// req.clientIp = '192.168.8.226'
|
||||
|
findMacAddress(req.clientIp, function (pErr, pMac) { |
||||
|
req.clientMac = pMac || null |
||||
|
req.flagHandler = new FlagHandler(req.clientIp, req.clientMac) |
||||
|
|
||||
|
try { |
||||
|
req.isIos = req.headers['user-agent'].indexOf('CaptiveNetworkSupport') !== -1 || req.headers['user-agent'].indexOf('iPhone') !== -1 |
||||
|
} catch (e) {} |
||||
|
|
||||
|
next() |
||||
|
}) |
||||
|
}) |
||||
|
|
||||
|
app.use(function (req, res, next) { |
||||
|
if (CFG.quiet) { |
||||
|
return next() |
||||
|
} |
||||
|
let currentDate = new Date() |
||||
|
let isFlagged = req.flagHandler.getFlag() |
||||
|
if (req.hostname === 'detectportal.firefox.com') return next() |
||||
|
console.log(currentDate.toISOString().grey, '|', req.clientIp, '=>', req.clientMac || 'MacNotFound |', isFlagged ? 'OK'.green : 'ko'.red, '|', req.originalUrl) |
||||
|
console.log(req.hostname, req.headers['user-agent']) |
||||
|
next() |
||||
|
}) |
||||
|
|
||||
|
// API called to validate an MAC address
|
||||
|
app.all('/validate', function (req, res) { |
||||
|
req.flagHandler.setFlag() |
||||
|
if (req.isIos) { |
||||
|
res.status(302).set({ Location: '/ready.html' }).end() |
||||
|
} else { |
||||
|
res.status(200).end() |
||||
|
} |
||||
|
}) |
||||
|
|
||||
|
// Serve assets
|
||||
|
app.use(express.static(CFG.webapp.portal)) |
||||
|
|
||||
|
// Default callback
|
||||
|
app.use(function (req, res, next) { |
||||
|
let flag = req.flagHandler.getFlag() |
||||
|
// If MAC has been flag by one /validate call
|
||||
|
if (flag) { |
||||
|
// Case iOS
|
||||
|
if (req.isIos) { |
||||
|
res.status(200).send('<HTML><HEAD><TITLE>Success</TITLE></HEAD><BODY>Success</BODY></HTML>') |
||||
|
} else { |
||||
|
res.status(204).end() |
||||
|
} |
||||
|
} else { |
||||
|
res.status(302).set({ Location: CFG.redirectTo }).end() |
||||
|
} |
||||
|
}) |
||||
|
|
||||
|
function findMacAddress (pIp, pCallback) { |
||||
|
exec(CFG.arpCmd, function (pCode, pStdout) { |
||||
|
let lines = pStdout.split('\n') |
||||
|
if (!lines.length) { |
||||
|
return pCallback('NotFound') |
||||
|
} |
||||
|
|
||||
|
for (let i = 0; i < lines.length; i++) { |
||||
|
let line = lines[i] |
||||
|
if (line.indexOf(pIp) !== -1) { |
||||
|
// console.log(line)
|
||||
|
let cols = line.split(' ').filter(function (str) { return !!str }) |
||||
|
return pCallback(null, cols[2]) |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
pCallback('NotFound') |
||||
|
}) |
||||
|
} |
||||
|
|
||||
|
class FlagHandler { |
||||
|
constructor (pIp, pMac) { |
||||
|
this.ip = pIp |
||||
|
this.mac = pMac |
||||
|
} |
||||
|
|
||||
|
setFlag () { |
||||
|
if (!this.mac) { |
||||
|
ByIp[this.ip] = new Date() |
||||
|
} else { |
||||
|
ByMac[this.mac] = new Date() |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
getFlag () { |
||||
|
let flag = null |
||||
|
if (!this.mac) { |
||||
|
flag = ByIp[this.ip] |
||||
|
} else { |
||||
|
flag = ByMac[this.mac] |
||||
|
} |
||||
|
return flag || null |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
app.listen(CFG.port, function () { |
||||
|
console.log(`[>] PXPortal service running on: ${CFG.port}`) |
||||
|
}) |
||||
@ -0,0 +1,392 @@ |
|||||
|
{ |
||||
|
"name": "portal-srv", |
||||
|
"version": "1.0.0", |
||||
|
"lockfileVersion": 1, |
||||
|
"requires": true, |
||||
|
"dependencies": { |
||||
|
"accepts": { |
||||
|
"version": "1.3.7", |
||||
|
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", |
||||
|
"integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", |
||||
|
"requires": { |
||||
|
"mime-types": "2.1.24", |
||||
|
"negotiator": "0.6.2" |
||||
|
} |
||||
|
}, |
||||
|
"array-flatten": { |
||||
|
"version": "1.1.1", |
||||
|
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", |
||||
|
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" |
||||
|
}, |
||||
|
"body-parser": { |
||||
|
"version": "1.19.0", |
||||
|
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", |
||||
|
"integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", |
||||
|
"requires": { |
||||
|
"bytes": "3.1.0", |
||||
|
"content-type": "1.0.4", |
||||
|
"debug": "2.6.9", |
||||
|
"depd": "1.1.2", |
||||
|
"http-errors": "1.7.2", |
||||
|
"iconv-lite": "0.4.24", |
||||
|
"on-finished": "2.3.0", |
||||
|
"qs": "6.7.0", |
||||
|
"raw-body": "2.4.0", |
||||
|
"type-is": "1.6.18" |
||||
|
} |
||||
|
}, |
||||
|
"bytes": { |
||||
|
"version": "3.1.0", |
||||
|
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", |
||||
|
"integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" |
||||
|
}, |
||||
|
"colors": { |
||||
|
"version": "1.3.3", |
||||
|
"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", |
||||
|
"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==" |
||||
|
}, |
||||
|
"content-disposition": { |
||||
|
"version": "0.5.3", |
||||
|
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", |
||||
|
"integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", |
||||
|
"requires": { |
||||
|
"safe-buffer": "5.1.2" |
||||
|
} |
||||
|
}, |
||||
|
"content-type": { |
||||
|
"version": "1.0.4", |
||||
|
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", |
||||
|
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" |
||||
|
}, |
||||
|
"cookie": { |
||||
|
"version": "0.4.0", |
||||
|
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", |
||||
|
"integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" |
||||
|
}, |
||||
|
"cookie-signature": { |
||||
|
"version": "1.0.6", |
||||
|
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", |
||||
|
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" |
||||
|
}, |
||||
|
"debug": { |
||||
|
"version": "2.6.9", |
||||
|
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", |
||||
|
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", |
||||
|
"requires": { |
||||
|
"ms": "2.0.0" |
||||
|
} |
||||
|
}, |
||||
|
"depd": { |
||||
|
"version": "1.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", |
||||
|
"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" |
||||
|
}, |
||||
|
"destroy": { |
||||
|
"version": "1.0.4", |
||||
|
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", |
||||
|
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" |
||||
|
}, |
||||
|
"ee-first": { |
||||
|
"version": "1.1.1", |
||||
|
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", |
||||
|
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" |
||||
|
}, |
||||
|
"encodeurl": { |
||||
|
"version": "1.0.2", |
||||
|
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", |
||||
|
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" |
||||
|
}, |
||||
|
"escape-html": { |
||||
|
"version": "1.0.3", |
||||
|
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", |
||||
|
"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" |
||||
|
}, |
||||
|
"etag": { |
||||
|
"version": "1.8.1", |
||||
|
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", |
||||
|
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" |
||||
|
}, |
||||
|
"express": { |
||||
|
"version": "4.17.1", |
||||
|
"resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", |
||||
|
"integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", |
||||
|
"requires": { |
||||
|
"accepts": "1.3.7", |
||||
|
"array-flatten": "1.1.1", |
||||
|
"body-parser": "1.19.0", |
||||
|
"content-disposition": "0.5.3", |
||||
|
"content-type": "1.0.4", |
||||
|
"cookie": "0.4.0", |
||||
|
"cookie-signature": "1.0.6", |
||||
|
"debug": "2.6.9", |
||||
|
"depd": "1.1.2", |
||||
|
"encodeurl": "1.0.2", |
||||
|
"escape-html": "1.0.3", |
||||
|
"etag": "1.8.1", |
||||
|
"finalhandler": "1.1.2", |
||||
|
"fresh": "0.5.2", |
||||
|
"merge-descriptors": "1.0.1", |
||||
|
"methods": "1.1.2", |
||||
|
"on-finished": "2.3.0", |
||||
|
"parseurl": "1.3.3", |
||||
|
"path-to-regexp": "0.1.7", |
||||
|
"proxy-addr": "2.0.5", |
||||
|
"qs": "6.7.0", |
||||
|
"range-parser": "1.2.1", |
||||
|
"safe-buffer": "5.1.2", |
||||
|
"send": "0.17.1", |
||||
|
"serve-static": "1.14.1", |
||||
|
"setprototypeof": "1.1.1", |
||||
|
"statuses": "1.5.0", |
||||
|
"type-is": "1.6.18", |
||||
|
"utils-merge": "1.0.1", |
||||
|
"vary": "1.1.2" |
||||
|
} |
||||
|
}, |
||||
|
"finalhandler": { |
||||
|
"version": "1.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", |
||||
|
"integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", |
||||
|
"requires": { |
||||
|
"debug": "2.6.9", |
||||
|
"encodeurl": "1.0.2", |
||||
|
"escape-html": "1.0.3", |
||||
|
"on-finished": "2.3.0", |
||||
|
"parseurl": "1.3.3", |
||||
|
"statuses": "1.5.0", |
||||
|
"unpipe": "1.0.0" |
||||
|
} |
||||
|
}, |
||||
|
"forwarded": { |
||||
|
"version": "0.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", |
||||
|
"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" |
||||
|
}, |
||||
|
"fresh": { |
||||
|
"version": "0.5.2", |
||||
|
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", |
||||
|
"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" |
||||
|
}, |
||||
|
"http-errors": { |
||||
|
"version": "1.7.2", |
||||
|
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", |
||||
|
"integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", |
||||
|
"requires": { |
||||
|
"depd": "1.1.2", |
||||
|
"inherits": "2.0.3", |
||||
|
"setprototypeof": "1.1.1", |
||||
|
"statuses": "1.5.0", |
||||
|
"toidentifier": "1.0.0" |
||||
|
} |
||||
|
}, |
||||
|
"iconv-lite": { |
||||
|
"version": "0.4.24", |
||||
|
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", |
||||
|
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", |
||||
|
"requires": { |
||||
|
"safer-buffer": "2.1.2" |
||||
|
} |
||||
|
}, |
||||
|
"inherits": { |
||||
|
"version": "2.0.3", |
||||
|
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", |
||||
|
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" |
||||
|
}, |
||||
|
"ipaddr.js": { |
||||
|
"version": "1.9.0", |
||||
|
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", |
||||
|
"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" |
||||
|
}, |
||||
|
"is_js": { |
||||
|
"version": "0.9.0", |
||||
|
"resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz", |
||||
|
"integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0=" |
||||
|
}, |
||||
|
"media-typer": { |
||||
|
"version": "0.3.0", |
||||
|
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", |
||||
|
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" |
||||
|
}, |
||||
|
"merge-descriptors": { |
||||
|
"version": "1.0.1", |
||||
|
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", |
||||
|
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" |
||||
|
}, |
||||
|
"methods": { |
||||
|
"version": "1.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", |
||||
|
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" |
||||
|
}, |
||||
|
"mime": { |
||||
|
"version": "1.6.0", |
||||
|
"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", |
||||
|
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" |
||||
|
}, |
||||
|
"mime-db": { |
||||
|
"version": "1.40.0", |
||||
|
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", |
||||
|
"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" |
||||
|
}, |
||||
|
"mime-types": { |
||||
|
"version": "2.1.24", |
||||
|
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", |
||||
|
"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", |
||||
|
"requires": { |
||||
|
"mime-db": "1.40.0" |
||||
|
} |
||||
|
}, |
||||
|
"ms": { |
||||
|
"version": "2.0.0", |
||||
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", |
||||
|
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" |
||||
|
}, |
||||
|
"negotiator": { |
||||
|
"version": "0.6.2", |
||||
|
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", |
||||
|
"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" |
||||
|
}, |
||||
|
"on-finished": { |
||||
|
"version": "2.3.0", |
||||
|
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", |
||||
|
"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", |
||||
|
"requires": { |
||||
|
"ee-first": "1.1.1" |
||||
|
} |
||||
|
}, |
||||
|
"parseurl": { |
||||
|
"version": "1.3.3", |
||||
|
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", |
||||
|
"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" |
||||
|
}, |
||||
|
"path-to-regexp": { |
||||
|
"version": "0.1.7", |
||||
|
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", |
||||
|
"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" |
||||
|
}, |
||||
|
"proxy-addr": { |
||||
|
"version": "2.0.5", |
||||
|
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", |
||||
|
"integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", |
||||
|
"requires": { |
||||
|
"forwarded": "0.1.2", |
||||
|
"ipaddr.js": "1.9.0" |
||||
|
} |
||||
|
}, |
||||
|
"qs": { |
||||
|
"version": "6.7.0", |
||||
|
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", |
||||
|
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" |
||||
|
}, |
||||
|
"range-parser": { |
||||
|
"version": "1.2.1", |
||||
|
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", |
||||
|
"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" |
||||
|
}, |
||||
|
"raw-body": { |
||||
|
"version": "2.4.0", |
||||
|
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", |
||||
|
"integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", |
||||
|
"requires": { |
||||
|
"bytes": "3.1.0", |
||||
|
"http-errors": "1.7.2", |
||||
|
"iconv-lite": "0.4.24", |
||||
|
"unpipe": "1.0.0" |
||||
|
} |
||||
|
}, |
||||
|
"request-ip": { |
||||
|
"version": "2.1.3", |
||||
|
"resolved": "https://registry.npmjs.org/request-ip/-/request-ip-2.1.3.tgz", |
||||
|
"integrity": "sha512-J3qdE/IhVM3BXkwMIVO4yFrvhJlU3H7JH16+6yHucadT4fePnR8dyh+vEs6FIx0S2x5TCt2ptiPfHcn0sqhbYQ==", |
||||
|
"requires": { |
||||
|
"is_js": "0.9.0" |
||||
|
} |
||||
|
}, |
||||
|
"safe-buffer": { |
||||
|
"version": "5.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", |
||||
|
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" |
||||
|
}, |
||||
|
"safer-buffer": { |
||||
|
"version": "2.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", |
||||
|
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" |
||||
|
}, |
||||
|
"send": { |
||||
|
"version": "0.17.1", |
||||
|
"resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", |
||||
|
"integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", |
||||
|
"requires": { |
||||
|
"debug": "2.6.9", |
||||
|
"depd": "1.1.2", |
||||
|
"destroy": "1.0.4", |
||||
|
"encodeurl": "1.0.2", |
||||
|
"escape-html": "1.0.3", |
||||
|
"etag": "1.8.1", |
||||
|
"fresh": "0.5.2", |
||||
|
"http-errors": "1.7.2", |
||||
|
"mime": "1.6.0", |
||||
|
"ms": "2.1.1", |
||||
|
"on-finished": "2.3.0", |
||||
|
"range-parser": "1.2.1", |
||||
|
"statuses": "1.5.0" |
||||
|
}, |
||||
|
"dependencies": { |
||||
|
"ms": { |
||||
|
"version": "2.1.1", |
||||
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", |
||||
|
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" |
||||
|
} |
||||
|
} |
||||
|
}, |
||||
|
"serve-static": { |
||||
|
"version": "1.14.1", |
||||
|
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", |
||||
|
"integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", |
||||
|
"requires": { |
||||
|
"encodeurl": "1.0.2", |
||||
|
"escape-html": "1.0.3", |
||||
|
"parseurl": "1.3.3", |
||||
|
"send": "0.17.1" |
||||
|
} |
||||
|
}, |
||||
|
"setprototypeof": { |
||||
|
"version": "1.1.1", |
||||
|
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", |
||||
|
"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" |
||||
|
}, |
||||
|
"statuses": { |
||||
|
"version": "1.5.0", |
||||
|
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", |
||||
|
"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" |
||||
|
}, |
||||
|
"toidentifier": { |
||||
|
"version": "1.0.0", |
||||
|
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", |
||||
|
"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" |
||||
|
}, |
||||
|
"type-is": { |
||||
|
"version": "1.6.18", |
||||
|
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", |
||||
|
"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", |
||||
|
"requires": { |
||||
|
"media-typer": "0.3.0", |
||||
|
"mime-types": "2.1.24" |
||||
|
} |
||||
|
}, |
||||
|
"unpipe": { |
||||
|
"version": "1.0.0", |
||||
|
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", |
||||
|
"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" |
||||
|
}, |
||||
|
"utils-merge": { |
||||
|
"version": "1.0.1", |
||||
|
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", |
||||
|
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" |
||||
|
}, |
||||
|
"vary": { |
||||
|
"version": "1.1.2", |
||||
|
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", |
||||
|
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,17 @@ |
|||||
|
{ |
||||
|
"name": "portal-srv", |
||||
|
"version": "1.0.0", |
||||
|
"description": "Portal server to simulate captive API", |
||||
|
"main": "index.js", |
||||
|
"dependencies": { |
||||
|
"colors": "^1.3.3", |
||||
|
"express": "^4.17.1", |
||||
|
"request-ip": "^2.1.3" |
||||
|
}, |
||||
|
"devDependencies": {}, |
||||
|
"scripts": { |
||||
|
"test": "echo \"Error: no test specified\" && exit 1" |
||||
|
}, |
||||
|
"author": "P.BARRY", |
||||
|
"license": "ISC" |
||||
|
} |
||||
@ -0,0 +1,80 @@ |
|||||
|
# Configuration file for dnsmasq. |
||||
|
# |
||||
|
# Format is one option per line, legal options are the same |
||||
|
# as the long options legal on the command line. See |
||||
|
# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. |
||||
|
|
||||
|
|
||||
|
|
||||
|
# Configuration file for dnsmasq. |
||||
|
# |
||||
|
# Format is one option per line, legal options are the same |
||||
|
# as the long options legal on the command line. See |
||||
|
# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. |
||||
|
|
||||
|
# If you want dnsmasq to listen for DHCP and DNS requests only on |
||||
|
# specified interfaces (and the loopback) give the name of the |
||||
|
# interface (eg eth0) here. |
||||
|
# Repeat the line for more than one interface. |
||||
|
# interface=ienx9cebe834212c |
||||
|
|
||||
|
except-interface=lo |
||||
|
except-interface=br-75cf00050d15 |
||||
|
except-interface=br-e2afb4e16be1 |
||||
|
except-interface=br-ecf8a233e315 |
||||
|
except-interface=docker0 |
||||
|
except-interface=veth6d304b8 |
||||
|
except-interface=vethd88f427 |
||||
|
except-interface=vethe97c735 |
||||
|
except-interface=wlp2s0 |
||||
|
|
||||
|
#bind-dynamic |
||||
|
bind-interfaces |
||||
|
|
||||
|
######### dns ######## |
||||
|
# Never forward plain names (without a dot or domain part) |
||||
|
domain-needed |
||||
|
# Never forward addresses in the non-routed address spaces |
||||
|
bogus-priv |
||||
|
# dont read resolv.conf use the defined servers instead |
||||
|
no-resolv |
||||
|
server=8.8.8.8 |
||||
|
server=8.8.4.4 |
||||
|
# increase dns cache form 512 to 4096 |
||||
|
cache-size=4096 |
||||
|
# Add domains which you want to force to an IP address here. |
||||
|
address=/@@HOST@@/192.168.0.2 |
||||
|
address=/.@@HOST@@/192.168.0.2 |
||||
|
address=/pxcom.aero/192.168.0.2 |
||||
|
address=/.pxcom.aero/192.168.0.2 |
||||
|
|
||||
|
@@DOMAINS@@ |
||||
|
|
||||
|
# address=/#/192.168.0.2 |
||||
|
|
||||
|
######### dhcp ########## |
||||
|
# Add local-only domains here, queries in these domains are answered |
||||
|
# from /etc/hosts or DHCP only |
||||
|
local=/aero/ |
||||
|
# Set this (and domain: see below) if you want to have a domain |
||||
|
# automatically added to simple names in a hosts-file. |
||||
|
expand-hosts |
||||
|
# adds my localdomain to each dhcp host |
||||
|
domain=@@HOST@@ |
||||
|
# my private dhcp range + subnetmask + 14d lease time |
||||
|
dhcp-range=192.168.0.10,192.168.0.200,255.255.255.0,14d |
||||
|
dhcp-option-force=160,"http://portal.@@HOST@@" |
||||
|
# set route to my local network router |
||||
|
#dhcp-option=option:router,192.168.178.1 |
||||
|
#windows 7 float fix |
||||
|
#http://brielle.sosdg.org/archives/522-Windows-7-flooding-DHCP-server-with-DHCPINFORM-messages.html |
||||
|
dhcp-option=252,"\n" |
||||
|
|
||||
|
###### logging ############ |
||||
|
# own logfile |
||||
|
log-facility=/var/log/dnsmasq.log |
||||
|
log-async |
||||
|
# log dhcp infos |
||||
|
log-dhcp |
||||
|
# debugging dns |
||||
|
log-queries |
||||
@ -0,0 +1,22 @@ |
|||||
|
server { |
||||
|
server_name captive.@@HOST@@ |
||||
|
@@DOMAINS@@; |
||||
|
|
||||
|
location / { |
||||
|
proxy_pass http://127.0.0.1:@@PORT@@/; |
||||
|
proxy_set_header Host $host; |
||||
|
proxy_set_header X-Real-Ip $remote_addr; |
||||
|
proxy_buffering off; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
server { |
||||
|
listen 80 default_server; |
||||
|
server_name _ eca.aero; |
||||
|
root @@WEBAPP_HOME@@; |
||||
|
} |
||||
|
|
||||
|
server { |
||||
|
server_name portal.@@HOST@@; |
||||
|
root @@WEBAPP_PORTAL@@; |
||||
|
} |
||||
@ -0,0 +1,12 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html> |
||||
|
<head> |
||||
|
<meta charset="utf-8" /> |
||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge"> |
||||
|
<title>WELCOME</title> |
||||
|
<meta name="viewport" content="width=device-width, initial-scale=1"> |
||||
|
</head> |
||||
|
<body> |
||||
|
<h1>Welcome To GUIDE!!!</h1> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,12 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html> |
||||
|
<head> |
||||
|
<meta charset="utf-8" /> |
||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge"> |
||||
|
<title>WELCOME</title> |
||||
|
<meta name="viewport" content="width=device-width, initial-scale=1"> |
||||
|
</head> |
||||
|
<body> |
||||
|
<h1>Welcome To GUIDE!!!</h1> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,15 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="en"> |
||||
|
<head> |
||||
|
<meta charset="UTF-8"> |
||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"> |
||||
|
<meta http-equiv="X-UA-Compatible" content="ie=edge"> |
||||
|
<title>Portal Captif</title> |
||||
|
</head> |
||||
|
<body> |
||||
|
<h1>Hello World</h1> |
||||
|
<form action="/ready.html"> |
||||
|
<button type="submit">OKAY!!!</button> |
||||
|
</form> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,20 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="en"> |
||||
|
<head> |
||||
|
<meta charset="UTF-8"> |
||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"> |
||||
|
<meta http-equiv="X-UA-Compatible" content="ie=edge"> |
||||
|
<title>Portal Captif</title> |
||||
|
</head> |
||||
|
<body> |
||||
|
<h1>Ready to navigate!</h1> |
||||
|
<a href="http://eca.aero" target="_blank">Go!!!</a> |
||||
|
</body> |
||||
|
</html> |
||||
|
|
||||
|
<script> |
||||
|
var xhttp = new XMLHttpRequest() |
||||
|
xhttp.open('GET', 'http://captive.eca.aero/validate') |
||||
|
xhttp.send() |
||||
|
</script> |
||||
|
|
||||
Write
Preview
Loading…
Cancel
Save