- Access split into Internet and Home network cards; network tiles inline, Auto-detect LAN beside them, other interfaces folded by kind - Devices reach each other: Off, Everyone or Circles (per server); circles with names, colours and members; a person's own devices always see each other while it is not off - Per-person home networks: people can be kept out of some of the server's networks (nft lan_part set, AllowedIPs follow) - Home services moved from Settings to Access, added from the devices the router sees over DHCP (ports they announce over Bonjour when umdns runs) - Who reaches what (rules summed up per access) and Check access (walks the same rules as nft and the client configuration, step by step) - Find home devices (Bonjour): umdns services published as DNS-SD records in dnsmasq; installs umdns from Access - Connections from home show the DHCP name with the address in brackets - Repaints keep the scroll position
This commit is contained in:
1 parent
82ab86848e
commit
aa8256bc60
26 files changed
+1638
-266
No files matched your search
@@ -39,7 +39,14 @@ limits, live traffic and a LuCI admin that follows a modern design.
|
||||
same link at home, and wrong links can redirect to your website.
|
||||
- **Access per person**, enforced in an `inet dawnline` nftables table on the
|
||||
tunnel interface: home network only, internet only, or both, and optionally
|
||||
only some home services.
|
||||
only some home networks or home services (picked from the devices the router
|
||||
sees over DHCP). Devices of different people reach each other never, always,
|
||||
or within circles (family sees family, guests see guests). "Who reaches what"
|
||||
sums up the rules and "Check access" walks them step by step for a device
|
||||
and an address.
|
||||
- **Find home devices** (optional, needs `umdns`): AirPlay, printers and shared
|
||||
Macs at home show up on iPhone, iPad and Mac over the tunnel, published as
|
||||
DNS-SD records in dnsmasq.
|
||||
- **Limits.** End dates (pause, keep, or remove devices when they pass), monthly
|
||||
or total data limits, allowed hours, pause one person or everyone. Devices
|
||||
drop off the tunnel at once (`awg syncconf`, no interface restart).
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-dawnline
|
||||
PKG_VERSION:=0.2.0
|
||||
PKG_VERSION:=0.3.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
'require rpc';
|
||||
'require uci';
|
||||
'require ui';
|
||||
var $n=Object.create;var Kt=Object.defineProperty;var _n=Object.getOwnPropertyDescriptor;var Ln=Object.getOwnPropertyNames;var Sn=Object.getPrototypeOf,Mn=Object.prototype.hasOwnProperty;var En=(s,t)=>()=>(t||s((t={exports:{}}).exports,t),t.exports);var Tn=(s,t,n,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of Ln(t))!Mn.call(s,i)&&i!==n&&Kt(s,i,{get:()=>t[i],enumerable:!(a=_n(t,i))||a.enumerable});return s};var Cn=(s,t,n)=>(n=s!=null?$n(Sn(s)):{},Tn(t||!s||!s.__esModule?Kt(n,"default",{value:s,enumerable:!0}):n,s));var Zt=En((Jt,Qt)=>{"use strict";var Yt=(function(){var s=function(w,D){var E=236,M=17,u=w,$=n[D],h=null,p=0,T=null,m=[],y={},P=function(_,S){p=u*4+17,h=(function(x){for(var C=new Array(x),A=0;A<x;A+=1){C[A]=new Array(x);for(var j=0;j<x;j+=1)C[A][j]=null}return C})(p),O(0,0),O(p-7,0),O(0,p-7),ee(),Z(),he(_,S),u>=7&&ie(_),T==null&&(T=$t(u,$,m)),ue(T,S)},O=function(_,S){for(var x=-1;x<=7;x+=1)if(!(_+x<=-1||p<=_+x))for(var C=-1;C<=7;C+=1)S+C<=-1||p<=S+C||(0<=x&&x<=6&&(C==0||C==6)||0<=C&&C<=6&&(x==0||x==6)||2<=x&&x<=4&&2<=C&&C<=4?h[_+x][S+C]=!0:h[_+x][S+C]=!1)},H=function(){for(var _=0,S=0,x=0;x<8;x+=1){P(!0,x);var C=i.getLostPoint(y);(x==0||_>C)&&(_=C,S=x)}return S},Z=function(){for(var _=8;_<p-8;_+=1)h[_][6]==null&&(h[_][6]=_%2==0);for(var S=8;S<p-8;S+=1)h[6][S]==null&&(h[6][S]=S%2==0)},ee=function(){for(var _=i.getPatternPosition(u),S=0;S<_.length;S+=1)for(var x=0;x<_.length;x+=1){var C=_[S],A=_[x];if(h[C][A]==null)for(var j=-2;j<=2;j+=1)for(var G=-2;G<=2;G+=1)j==-2||j==2||G==-2||G==2||j==0&&G==0?h[C+j][A+G]=!0:h[C+j][A+G]=!1}},ie=function(_){for(var S=i.getBCHTypeNumber(u),x=0;x<18;x+=1){var C=!_&&(S>>x&1)==1;h[Math.floor(x/3)][x%3+p-8-3]=C}for(var x=0;x<18;x+=1){var C=!_&&(S>>x&1)==1;h[x%3+p-8-3][Math.floor(x/3)]=C}},he=function(_,S){for(var x=$<<3|S,C=i.getBCHTypeInfo(x),A=0;A<15;A+=1){var j=!_&&(C>>A&1)==1;A<6?h[A][8]=j:A<8?h[A+1][8]=j:h[p-15+A][8]=j}for(var A=0;A<15;A+=1){var j=!_&&(C>>A&1)==1;A<8?h[8][p-A-1]=j:A<9?h[8][15-A-1+1]=j:h[8][15-A-1]=j}h[p-8][8]=!_},ue=function(_,S){for(var x=-1,C=p-1,A=7,j=0,G=i.getMaskFunction(S),q=p-1;q>0;q-=2)for(q==6&&(q-=1);;){for(var te=0;te<2;te+=1)if(h[C][q-te]==null){var re=!1;j<_.length&&(re=(_[j]>>>A&1)==1);var W=G(C,q-te);W&&(re=!re),h[C][q-te]=re,A-=1,A==-1&&(j+=1,A=7)}if(C+=x,C<0||p<=C){C-=x,x=-x;break}}},Ee=function(_,S){for(var x=0,C=0,A=0,j=new Array(S.length),G=new Array(S.length),q=0;q<S.length;q+=1){var te=S[q].dataCount,re=S[q].totalCount-te;C=Math.max(C,te),A=Math.max(A,re),j[q]=new Array(te);for(var W=0;W<j[q].length;W+=1)j[q][W]=255&_.getBuffer()[W+x];x+=te;var ge=i.getErrorCorrectPolynomial(re),me=r(j[q],ge.getLength()-1),Gt=me.mod(ge);G[q]=new Array(ge.getLength()-1);for(var W=0;W<G[q].length;W+=1){var Wt=W+Gt.getLength()-G[q].length;G[q][W]=Wt>=0?Gt.getAt(Wt):0}}for(var Ft=0,W=0;W<S.length;W+=1)Ft+=S[W].totalCount;for(var _t=new Array(Ft),it=0,W=0;W<C;W+=1)for(var q=0;q<S.length;q+=1)W<j[q].length&&(_t[it]=j[q][W],it+=1);for(var W=0;W<A;W+=1)for(var q=0;q<S.length;q+=1)W<G[q].length&&(_t[it]=G[q][W],it+=1);return _t},$t=function(_,S,x){for(var C=l.getRSBlocks(_,S),A=d(),j=0;j<x.length;j+=1){var G=x[j];A.put(G.getMode(),4),A.put(G.getLength(),i.getLengthInBits(G.getMode(),_)),G.write(A)}for(var q=0,j=0;j<C.length;j+=1)q+=C[j].dataCount;if(A.getLengthInBits()>q*8)throw"code length overflow. ("+A.getLengthInBits()+">"+q*8+")";for(A.getLengthInBits()+4<=q*8&&A.put(0,4);A.getLengthInBits()%8!=0;)A.putBit(!1);for(;!(A.getLengthInBits()>=q*8||(A.put(E,8),A.getLengthInBits()>=q*8));)A.put(M,8);return Ee(A,C)};y.addData=function(_,S){S=S||"Byte";var x=null;switch(S){case"Numeric":x=g(_);break;case"Alphanumeric":x=f(_);break;case"Byte":x=c(_);break;case"Kanji":x=k(_);break;default:throw"mode:"+S}m.push(x),T=null},y.isDark=function(_,S){if(_<0||p<=_||S<0||p<=S)throw _+","+S;return h[_][S]},y.getModuleCount=function(){return p},y.make=function(){if(u<1){for(var _=1;_<40;_++){for(var S=l.getRSBlocks(_,$),x=d(),C=0;C<m.length;C++){var A=m[C];x.put(A.getMode(),4),x.put(A.getLength(),i.getLengthInBits(A.getMode(),_)),A.write(x)}for(var j=0,C=0;C<S.length;C++)j+=S[C].dataCount;if(x.getLengthInBits()<=j*8)break}u=_}P(!1,H())},y.createTableTag=function(_,S){_=_||2,S=typeof S>"u"?_*4:S;var x="";x+='<table style="',x+=" border-width: 0px; border-style: none;",x+=" border-collapse: collapse;",x+=" padding: 0px; margin: "+S+"px;",x+='">',x+="<tbody>";for(var C=0;C<y.getModuleCount();C+=1){x+="<tr>";for(var A=0;A<y.getModuleCount();A+=1)x+='<td style="',x+=" border-width: 0px; border-style: none;",x+=" border-collapse: collapse;",x+=" padding: 0px; margin: 0px;",x+=" width: "+_+"px;",x+=" height: "+_+"px;",x+=" background-color: ",x+=y.isDark(C,A)?"#000000":"#ffffff",x+=";",x+='"/>';x+="</tr>"}return x+="</tbody>",x+="</table>",x},y.createSvgTag=function(_,S,x,C){var A={};typeof arguments[0]=="object"&&(A=arguments[0],_=A.cellSize,S=A.margin,x=A.alt,C=A.title),_=_||2,S=typeof S>"u"?_*4:S,x=typeof x=="string"?{text:x}:x||{},x.text=x.text||null,Line truncated
|
||||
`}return x%2&&_>0?me.substring(0,me.length-x-1)+Array(x+1).join("▀"):me.substring(0,me.length-1)};return y.createASCII=function(_,S){if(_=_||1,_<2)return oe(S);_-=1,S=typeof S>"u"?_*2:S;var x=y.getModuleCount()*_+S*2,C=S,A=x-S,j,G,q,te,re=Array(_+1).join("██"),W=Array(_+1).join(" "),ge="",me="";for(j=0;j<x;j+=1){for(q=Math.floor((j-C)/_),me="",G=0;G<x;G+=1)te=1,C<=G&&G<A&&C<=j&&j<A&&y.isDark(q,Math.floor((G-C)/_))&&(te=0),me+=te?re:W;for(q=0;q<_;q+=1)ge+=me+`
|
||||
`}return ge.substring(0,ge.length-1)},y.renderTo2dContext=function(_,S){S=S||2;for(var x=y.getModuleCount(),C=0;C<x;C++)for(var A=0;A<x;A++)_.fillStyle=y.isDark(C,A)?"black":"white",_.fillRect(C*S,A*S,S,S)},y};s.stringToBytesFuncs={default:function(w){for(var D=[],E=0;E<w.length;E+=1){var M=w.charCodeAt(E);D.push(M&255)}return D}},s.stringToBytes=s.stringToBytesFuncs.default,s.createStringToBytes=function(w,D){var E=(function(){for(var u=Y(w),$=function(){var Z=u.read();if(Z==-1)throw"eof";return Z},h=0,p={};;){var T=u.read();if(T==-1)break;var m=$(),y=$(),P=$(),O=String.fromCharCode(T<<8|m),H=y<<8|P;p[O]=H,h+=1}if(h!=D)throw h+" != "+D;return p})(),M=63;return function(u){for(var $=[],h=0;h<u.length;h+=1){var p=u.charCodeAt(h);if(p<128)$.push(p);else{var T=E[u.charAt(h)];typeof T=="number"?(T&255)==T?$.push(T):($.push(T>>>8),$.push(T&255)):$.push(M)}}return $}};var t={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},n={L:1,M:0,Q:3,H:2},a={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},i=(function(){var w=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],D=1335,E=7973,M=21522,u={},$=function(h){for(var p=0;h!=0;)p+=1,h>>>=1;return p};return u.getBCHTypeInfo=function(h){for(var p=h<<10;$(p)-$(D)>=0;)p^=D<<$(p)-$(D);return(h<<10|p)^M},u.getBCHTypeNumber=function(h){for(var p=h<<12;$(p)-$(E)>=0;)p^=E<<$(p)-$(E);return h<<12|p},u.getPatternPosition=function(h){return w[h-1]},u.getMaskFunction=function(h){switch(h){case a.PATTERN000:return function(p,T){return(p+T)%2==0};case a.PATTERN001:return function(p,T){return p%2==0};case a.PATTERN010:return function(p,T){return T%3==0};case a.PATTERN011:return function(p,T){return(p+T)%3==0};case a.PATTERN100:return function(p,T){return(Math.floor(p/2)+Math.floor(T/3))%2==0};case a.PATTERN101:return function(p,T){return p*T%2+p*T%3==0};case a.PATTERN110:return function(p,T){return(p*T%2+p*T%3)%2==0};case a.PATTERN111:return function(p,T){return(p*T%3+(p+T)%2)%2==0};default:throw"bad maskPattern:"+h}},u.getErrorCorrectPolynomial=function(h){for(var p=r([1],0),T=0;T<h;T+=1)p=p.multiply(r([1,o.gexp(T)],0));return p},u.getLengthInBits=function(h,p){if(1<=p&&p<10)switch(h){case t.MODE_NUMBER:return 10;case t.MODE_ALPHA_NUM:return 9;case t.MODE_8BIT_BYTE:return 8;case t.MODE_KANJI:return 8;default:throw"mode:"+h}else if(p<27)switch(h){case t.MODE_NUMBER:return 12;case t.MODE_ALPHA_NUM:return 11;case t.MODE_8BIT_BYTE:return 16;case t.MODE_KANJI:return 10;default:throw"mode:"+h}else if(p<41)switch(h){case t.MODE_NUMBER:return 14;case t.MODE_ALPHA_NUM:return 13;case t.MODE_8BIT_BYTE:return 16;case t.MODE_KANJI:return 12;default:throw"mode:"+h}else throw"type:"+p},u.getLostPoint=function(h){for(var p=h.getModuleCount(),T=0,m=0;m<p;m+=1)for(var y=0;y<p;y+=1){for(var P=0,O=h.isDark(m,y),H=-1;H<=1;H+=1)if(!(m+H<0||p<=m+H))for(var Z=-1;Z<=1;Z+=1)y+Z<0||p<=y+Z||H==0&&Z==0||O==h.isDark(m+H,y+Z)&&(P+=1);P>5&&(T+=3+P-5)}for(var m=0;m<p-1;m+=1)for(var y=0;y<p-1;y+=1){var ee=0;h.isDark(m,y)&&(ee+=1),h.isDark(m+1,y)&&(ee+=1),h.isDark(m,y+1)&&(ee+=1),h.isDark(m+1,y+1)&&(ee+=1),(ee==0||ee==4)&&(T+=3)}for(var m=0;m<p;m+=1)for(var y=0;y<p-6;y+=1)h.isDark(m,y)&&!h.isDark(m,y+1)&&h.isDark(m,y+2)&&h.isDark(m,y+3)&&h.isDark(m,y+4)&&!h.isDark(m,y+5)&&h.isDark(m,y+6)&&(T+=40);for(var y=0;y<p;y+=1)for(var m=0;m<p-6;m+=1)h.isDark(m,y)&&!h.isDark(m+1,y)&&h.isDark(m+2,y)&&h.isDark(m+3,y)&&h.isDark(m+4,y)&&!h.isDark(m+5,y)&&h.isDark(m+6,y)&&(T+=40);for(var ie=0,y=0;y<p;y+=1)for(var m=0;m<p;m+=1)h.isDark(m,y)&&(ie+=1);var he=Math.abs(100*ie/p/p-50)/5;return T+=he*10,T},u})(),o=(function(){for(var w=new Array(256),D=new Array(256),E=0;E<8;E+=1)w[E]=1<<E;for(var E=8;E<256;E+=1)w[E]=w[E-4]^w[E-5]^w[E-6]^w[E-8];for(var E=0;E<255;E+=1)D[w[E]]=E;var M={};return M.glog=function(u){if(u<1)throw"glog("+u+")";return D[u]},M.gexp=function(u){for(;u<0;)u+=255;for(;u>=256;)u-=255;return w[u]},M})();function r(w,D){if(typeof w.length>"u")throw w.length+"/"+D;var E=(function(){for(var u=0;u<w.length&&w[u]==0;)u+=1;for(var $=new Array(w.length-u+D),h=0;h<w.length-u;h+=1)$[h]=w[h+u];return $})(),M={};return M.getAt=function(u){return E[u]},M.getLength=function(){return E.length},M.multiply=function(u){for(var $=new Array(M.getLength()+u.getLength()-1),h=0;h<M.getLength();h+=1)for(var p=0;p<u.getLength();p+=1)$[h+p]^=o.gexp(o.glog(M.getAt(h))+o.glog(u.getAt(p)));return r($,0)},M.mod=function(u){if(M.g
Line truncated
|
||||
`),hostName:o,mtu:n.mtu,persistent_keep_alive:n.persistent_keep_alive,port:Number(n.port),psk_key:n.psk_key,server_pub_key:n.server_pub_key},l={containers:[{container:"amnezia-awg",awg:{isThirdPartyConfig:!0,last_config:JSON.stringify(r),port:String(n.port),protocol_version:a.header_protection_key?"3.1":"2",transport_proto:"udp"}}],defaultContainer:"amnezia-awg",description:t,hostName:o};return n.dns[0]&&(l.dns1=n.dns[0]),n.dns[1]&&(l.dns2=n.dns[1]),l}function qn(s){let t="";for(let n=0;n<s.length;n+=32768)t+=String.fromCharCode(...s.subarray(n,n+32768));return btoa(t).replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,"")}async function Gn(s){let t=globalThis;if(typeof t.CompressionStream>"u")return null;try{let n=new t.Blob([s]).stream().pipeThrough(new t.CompressionStream("deflate")),a=new Uint8Array(await new t.Response(n).arrayBuffer()),i=new Uint8Array(4+a.length);return new DataView(i.buffer).setUint32(0,s.length,!1),i.set(a,4),i}catch{return null}}async function en(s,t,n=!0){let a=new TextEncoder().encode(JSON.stringify(Un(s,t))),i=n?await Gn(a):null;return`vpn://${qn(i??a)}`}function K(s){if(!s||s<0)return"0 B";let t=["B","KB","MB","GB","TB"],n=0,a=s;for(;a>=1024&&n<t.length-1;)a/=1024,n++;return`${a>=100||n===0?Math.round(a):a.toFixed(1)} ${t[n]}`}function ke(s){let t=s*8;return t<1e3?`${Math.round(t)} bit/s`:t<1e6?`${(t/1e3).toFixed(t<1e4?1:0)} kbit/s`:t<1e9?`${(t/1e6).toFixed(t<1e7?1:0)} Mbit/s`:`${(t/1e9).toFixed(1)} Gbit/s`}function ce(s,t=Date.now()/1e3){if(!s)return"never";let n=Math.max(0,Math.round(t-s));return n<60?"just now":n<3600?`${Math.floor(n/60)} min ago`:n<86400?`${Math.floor(n/3600)} h ago`:n<86400*30?`${Math.floor(n/86400)} d ago`:new Date(s*1e3).toLocaleDateString("en-GB",{day:"numeric",month:"short",year:"numeric"})}function tn(s){if(!s||s<0)return"—";let t=Math.floor(s/86400),n=Math.floor(s%86400/3600),a=Math.floor(s%3600/60);return t?`${t}d ${n}h`:n?`${n}h ${a}m`:`${a}m`}function Pe(s){let t=new Date(s*1e3),n=new Date,a=t.toDateString()===n.toDateString(),i=t.toLocaleTimeString("en-GB",{hour:"2-digit",minute:"2-digit"});return a?i:`${t.toLocaleDateString("en-GB",{day:"numeric",month:"short"})} ${i}`}function $e(s){if(!s)return"";let[t,n,a]=s.split("-").map(Number);return new Date(t,n-1,a).toLocaleDateString("en-GB",{day:"numeric",month:"short",year:"numeric"})}function Ne(s,t=Date.now()){if(!s)return null;let[n,a,i]=s.split("-").map(Number),o=new Date(n,a-1,i,23,59,59).getTime();return Math.ceil((o-t)/864e5)}var Oe={lan:"Home network",internet:"Internet",both:"Home network + Internet"};var nn=["computer","phone","tablet","router","other"],_e={computer:"PC",phone:"Phone",tablet:"Tablet",router:"Router",other:"Other"},Tt={active:"Active",paused:"Paused",paused_all:"Paused (everyone)",expired:"Expired",quota:"Data limit reached",hours:"Outside allowed hours",no_server:"No server"};function ze(s){let t=s.trim().split(/\s+/).filter(Boolean);if(!t.length)return"?";let n=t[0][0]??"",a=t.length>1?t[t.length-1][0]??"":t[0][1]??"";return(n+a).toUpperCase()}function st(s){let t=n=>n.disabled?3:n.online?0:n.handshake?1:2;return s.map((n,a)=>[n,a]).sort((n,a)=>t(n[0])-t(a[0])||n[1]-a[1]).map(([n])=>n)}var an="https://unpkg.com/maplibre-gl@4.7.1/dist/maplibre-gl",Wn="https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json",Fn="https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",Kn={online:0,"24h":86400,"7d":7*86400,"30d":30*86400},Ye=null;function Vn(s){let t=window;return s.appendChild(e("link",{rel:"stylesheet",href:`${an}.css`})),t.maplibregl?Promise.resolve(t.maplibregl):Ye||(Ye=new Promise((n,a)=>{let i=e("script",{src:`${an}.js`});i.onload=()=>t.maplibregl?n(t.maplibregl):a(new Error("MapLibre failed to load")),i.onerror=()=>{Ye=null,a(new Error("Could not load the map library (no internet access from this browser?)"))},s.appendChild(i)}),Ye)}function ot(){let s=document.documentElement.getAttribute("data-darkmode");return s!=null?s==="true":window.matchMedia?.("(prefers-color-scheme: dark)").matches??!1}function Yn(s,t,n=48){let a=(s[0]+t[0])/2,i=(s[1]+t[1])/2,o=t[0]-s[0],r=t[1]-s[1],l=Math.hypot(o,r)||1,d=Math.min(.25*l,12),g=a-r/l*d,f=i+o/l*d,c=[];for(let k=0;k<=n;k++){let b=k/n,R=1-b;c.push([R*R*s[0]+2*R*b*g+b*b*t[0],R*R*s[1]+2*R*b*f+b*b*t[1]])}return c}function Jn(s,t){let n=new Map;for(let a of s.geo.points){if(s.person&&a.person!==s.person||(t==="online"?!a.online:s.now-a.ts>Kn[t]))continue;let i=n.get(a.device);(!i||a.online&&!i.online||a.online===i.online&&a.ts>i.ts)&&n.set(a.device,a)}return[...n.values()]}var Ue=class{constructor(t,n="online",a=380){this.cb=t;this.map=null;this.gl=null;this.markers=[];this.popup=null;this.anim=0;this.data=null;this.fitted=!1;this.range=n,this.status=e("div",{class:"dl-map-status"}),this.el=e("div",{class:"dl-geomap",style:`height:${a}px`},this.status)}async mount(t){this.data=t;try{this.gl=await Vn(this.el)}catch(n){this.status.textContent=n.message;return}this.map=new this.gl.Map({container:this.el,style:ot()?Wn:F
Line truncated
|
||||
${c.detail}`:""}`,where:pt[c.src]??c.src,by:""}))].sort((c,k)=>c.ts-k.ts).map(({ts:c,...k})=>({time:new Date(c*1e3).toISOString(),...k})),l=new Date().toISOString().slice(0,10),d=`dawnline-activity${a?`-${a}`:""}-${l}.${n}`;if(n==="json"){fe(d,JSON.stringify(r,null,2),"application/json");return}let g=["time","category","type","person","device","detail","where","by"],f=[g.join(","),...r.map(c=>g.map(k=>la(c[k])).join(","))].join(`
|
||||
`);fe(d,f,"text/csv")}var da=[["","Everything"],["7","Older than 7 days"],["30","Older than 30 days"],["90","Older than 90 days"]];function Te(s,t,n,a,i,o=!1){let r=e("select",{class:"cbi-input-select"},[e("option",{value:""},"All categories"),...Qe.map(d=>e("option",{value:d,selected:d===i?"selected":null},Ge[d])),o?e("option",{value:"system",selected:i==="system"?"selected":null},"System"):""]),l=e("select",{class:"cbi-input-select"},da.map(([d,g])=>e("option",{value:d},g)));ne(s,[e("p",{class:"dl-muted"},`${t} This cannot be undone; export first if you want a copy.`),e("label",{class:"dl-fld"},[e("span",{class:"dl-fld-label"},"Category"),r]),e("label",{class:"dl-fld"},[e("span",{class:"dl-fld-label"},"Which events"),l])],[e("button",{class:"cbi-button cbi-button-neutral",click:J},"Cancel")," ",z("Clear",async()=>{let d=await U(async()=>{let g=o&&(r.value==="system"||r.value==="")?await N.serviceLogClear(l.value):{removed:0},f=r.value==="system"?{removed:0}:await N.logsClear({...n,category:r.value,older_days:l.value});return{removed:g.removed+f.removed}});d&&(J(),X(d.removed?`${d.removed} event${d.removed===1?"":"s"} removed`:"Nothing matched","success",3e3),a())},"negative")])}function We(s,t,n,a){let i=s==="device"?`Clears ${n}'s daily and monthly traffic history. Their person's totals and data limit are not changed.`:s==="person"?`Clears ${n}'s traffic history and that of their devices. Their data limit starts again from zero.`:"Clears traffic history for everyone. Data limits start again from zero.";ne(s==="all"?"Reset all traffic history?":`Reset traffic history for ${n}?`,[e("p",{class:"dl-muted"},i)],[e("button",{class:"cbi-button cbi-button-neutral",click:J},"Cancel")," ",z("Reset",async()=>{await U(()=>N.usageClear(s,t),"Traffic history reset")&&(J(),a())},"negative")])}var ht=null;function ca(s){return s?new Date(s*1e3).toLocaleString("en-GB",{day:"numeric",month:"short",year:"numeric",hour:"2-digit",minute:"2-digit"}):"—"}function dn(s,t,n=!1){return e("div",{class:"dl-kvrow"},[e("span",{class:"dl-kvrow-k"},s),e("button",{type:"button",class:`dl-kvrow-v copy${n?" dl-mono":""}`,title:"Copy",click:()=>de(t,`${s} copied`)},[e("span",{},t),v("copy")])])}function ut(s,t){return e("div",{class:"dl-kvrow"},[e("span",{class:"dl-kvrow-k"},s),e("span",{class:"dl-kvrow-v"},t)])}function cn(s,t){if(/^\s*\[.+\]\s*$/.test(s))return e("span",{class:"dl-conf-sec"},s);let n=/^(\s*[A-Za-z0-9]+\s*=)\s*(.*)$/.exec(s);if(!n)return document.createTextNode(s);let a=/^(\s*)(PrivateKey|PresharedKey)\b/.test(s);return e("span",{},[e("span",{class:"dl-conf-k"},n[1])," ",a&&!t?e("span",{class:"dl-conf-mask"},"••••••••••••••••"):n[2]])}function pa(s){let t=!1,n=e("pre",{class:"dl-conf"}),a=()=>dom.content(n,s.conf.split(`
|
||||
var An=Object.create;var Qt=Object.defineProperty;var Pn=Object.getOwnPropertyDescriptor;var Nn=Object.getOwnPropertyNames;var zn=Object.getPrototypeOf,Rn=Object.prototype.hasOwnProperty;var Hn=(i,t)=>()=>(t||i((t={exports:{}}).exports,t),t.exports);var In=(i,t,n,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of Nn(t))!Rn.call(i,s)&&s!==n&&Qt(i,s,{get:()=>t[s],enumerable:!(a=Pn(t,s))||a.enumerable});return i};var Bn=(i,t,n)=>(n=i!=null?An(zn(i)):{},In(t||!i||!i.__esModule?Qt(n,"default",{value:i,enumerable:!0}):n,i));var nn=Hn((en,tn)=>{"use strict";var Xt=(function(){var i=function($,N){var C=236,T=17,y=$,A=n[N],m=null,h=0,P=null,f=[],_={},O=function(M,E){h=y*4+17,m=(function(x){for(var D=new Array(x),k=0;k<x;k+=1){D[k]=new Array(x);for(var H=0;H<x;H+=1)D[k][H]=null}return D})(h),G(0,0),G(h-7,0),G(0,h-7),q(),S(),te(M,E),y>=7&&W(M),P==null&&(P=Te(y,A,f)),le(P,E)},G=function(M,E){for(var x=-1;x<=7;x+=1)if(!(M+x<=-1||h<=M+x))for(var D=-1;D<=7;D+=1)E+D<=-1||h<=E+D||(0<=x&&x<=6&&(D==0||D==6)||0<=D&&D<=6&&(x==0||x==6)||2<=x&&x<=4&&2<=D&&D<=4?m[M+x][E+D]=!0:m[M+x][E+D]=!1)},B=function(){for(var M=0,E=0,x=0;x<8;x+=1){O(!0,x);var D=s.getLostPoint(_);(x==0||M>D)&&(M=D,E=x)}return E},S=function(){for(var M=8;M<h-8;M+=1)m[M][6]==null&&(m[M][6]=M%2==0);for(var E=8;E<h-8;E+=1)m[6][E]==null&&(m[6][E]=E%2==0)},q=function(){for(var M=s.getPatternPosition(y),E=0;E<M.length;E+=1)for(var x=0;x<M.length;x+=1){var D=M[E],k=M[x];if(m[D][k]==null)for(var H=-2;H<=2;H+=1)for(var V=-2;V<=2;V+=1)H==-2||H==2||V==-2||V==2||H==0&&V==0?m[D+H][k+V]=!0:m[D+H][k+V]=!1}},W=function(M){for(var E=s.getBCHTypeNumber(y),x=0;x<18;x+=1){var D=!M&&(E>>x&1)==1;m[Math.floor(x/3)][x%3+h-8-3]=D}for(var x=0;x<18;x+=1){var D=!M&&(E>>x&1)==1;m[x%3+h-8-3][Math.floor(x/3)]=D}},te=function(M,E){for(var x=A<<3|E,D=s.getBCHTypeInfo(x),k=0;k<15;k+=1){var H=!M&&(D>>k&1)==1;k<6?m[k][8]=H:k<8?m[k+1][8]=H:m[h-15+k][8]=H}for(var k=0;k<15;k+=1){var H=!M&&(D>>k&1)==1;k<8?m[8][h-k-1]=H:k<9?m[8][15-k-1+1]=H:m[8][15-k-1]=H}m[h-8][8]=!M},le=function(M,E){for(var x=-1,D=h-1,k=7,H=0,V=s.getMaskFunction(E),K=h-1;K>0;K-=2)for(K==6&&(K-=1);;){for(var ie=0;ie<2;ie+=1)if(m[D][K-ie]==null){var ce=!1;H<M.length&&(ce=(M[H]>>>k&1)==1);var Q=V(D,K-ie);Q&&(ce=!ce),m[D][K-ie]=ce,k-=1,k==-1&&(H+=1,k=7)}if(D+=x,D<0||h<=D){D-=x,x=-x;break}}},de=function(M,E){for(var x=0,D=0,k=0,H=new Array(E.length),V=new Array(E.length),K=0;K<E.length;K+=1){var ie=E[K].dataCount,ce=E[K].totalCount-ie;D=Math.max(D,ie),k=Math.max(k,ce),H[K]=new Array(ie);for(var Q=0;Q<H[K].length;Q+=1)H[K][Q]=255&M.getBuffer()[Q+x];x+=ie;var ge=s.getErrorCorrectPolynomial(ce),fe=r(H[K],ge.getLength()-1),Vt=fe.mod(ge);V[K]=new Array(ge.getLength()-1);for(var Q=0;Q<V[K].length;Q+=1){var Yt=Q+Vt.getLength()-V[K].length;V[K][Q]=Yt>=0?Vt.getAt(Yt):0}}for(var Jt=0,Q=0;Q<E.length;Q+=1)Jt+=E[Q].totalCount;for(var Et=new Array(Jt),ot=0,Q=0;Q<D;Q+=1)for(var K=0;K<E.length;K+=1)Q<H[K].length&&(Et[ot]=H[K][Q],ot+=1);for(var Q=0;Q<k;Q+=1)for(var K=0;K<E.length;K+=1)Q<V[K].length&&(Et[ot]=V[K][Q],ot+=1);return Et},Te=function(M,E,x){for(var D=l.getRSBlocks(M,E),k=d(),H=0;H<x.length;H+=1){var V=x[H];k.put(V.getMode(),4),k.put(V.getLength(),s.getLengthInBits(V.getMode(),M)),V.write(k)}for(var K=0,H=0;H<D.length;H+=1)K+=D[H].dataCount;if(k.getLengthInBits()>K*8)throw"code length overflow. ("+k.getLengthInBits()+">"+K*8+")";for(k.getLengthInBits()+4<=K*8&&k.put(0,4);k.getLengthInBits()%8!=0;)k.putBit(!1);for(;!(k.getLengthInBits()>=K*8||(k.put(C,8),k.getLengthInBits()>=K*8));)k.put(T,8);return de(k,D)};_.addData=function(M,E){E=E||"Byte";var x=null;switch(E){case"Numeric":x=p(M);break;case"Alphanumeric":x=u(M);break;case"Byte":x=c(M);break;case"Kanji":x=b(M);break;default:throw"mode:"+E}f.push(x),P=null},_.isDark=function(M,E){if(M<0||h<=M||E<0||h<=E)throw M+","+E;return m[M][E]},_.getModuleCount=function(){return h},_.make=function(){if(y<1){for(var M=1;M<40;M++){for(var E=l.getRSBlocks(M,A),x=d(),D=0;D<f.length;D++){var k=f[D];x.put(k.getMode(),4),x.put(k.getLength(),s.getLengthInBits(k.getMode(),M)),k.write(x)}for(var H=0,D=0;D<E.length;D++)H+=E[D].dataCount;if(x.getLengthInBits()<=H*8)break}y=M}O(!1,B())},_.createTableTag=function(M,E){M=M||2,E=typeof E>"u"?M*4:E;var x="";x+='<table style="',x+=" border-width: 0px; border-style: none;",x+=" border-collapse: collapse;",x+=" padding: 0px; margin: "+E+"px;",x+='">',x+="<tbody>";for(var D=0;D<_.getModuleCount();D+=1){x+="<tr>";for(var k=0;k<_.getModuleCount();k+=1)x+='<td style="',x+=" border-width: 0px; border-style: none;",x+=" border-collapse: collapse;",x+=" padding: 0px; margin: 0px;",x+=" width: "+M+"px;",x+=" height: "+M+"px;",x+=" background-color: ",x+=_.isDark(D,k)?"#000000":"#ffffff",x+=";",x+='"/>';x+="</tr>"}return x+="</tbody>",x+="</table>",x},_.createSvgTag=function(M,E,x,D){var k={};typeof arguments[0]=="object"&&(k=arguments[0],M=k.cellSize,E=k.margin,x=k.alt,D=k.title),M=M||2,E=typeof E>"u"?M*4:E,x=typeof x=="string"?{text:x}:x||{},x.text=x.text||null,x.idLine truncated
|
||||
`}return x%2&&M>0?fe.substring(0,fe.length-x-1)+Array(x+1).join("▀"):fe.substring(0,fe.length-1)};return _.createASCII=function(M,E){if(M=M||1,M<2)return ae(E);M-=1,E=typeof E>"u"?M*2:E;var x=_.getModuleCount()*M+E*2,D=E,k=x-E,H,V,K,ie,ce=Array(M+1).join("██"),Q=Array(M+1).join(" "),ge="",fe="";for(H=0;H<x;H+=1){for(K=Math.floor((H-D)/M),fe="",V=0;V<x;V+=1)ie=1,D<=V&&V<k&&D<=H&&H<k&&_.isDark(K,Math.floor((V-D)/M))&&(ie=0),fe+=ie?ce:Q;for(K=0;K<M;K+=1)ge+=fe+`
|
||||
`}return ge.substring(0,ge.length-1)},_.renderTo2dContext=function(M,E){E=E||2;for(var x=_.getModuleCount(),D=0;D<x;D++)for(var k=0;k<x;k++)M.fillStyle=_.isDark(D,k)?"black":"white",M.fillRect(D*E,k*E,E,E)},_};i.stringToBytesFuncs={default:function($){for(var N=[],C=0;C<$.length;C+=1){var T=$.charCodeAt(C);N.push(T&255)}return N}},i.stringToBytes=i.stringToBytesFuncs.default,i.createStringToBytes=function($,N){var C=(function(){for(var y=F($),A=function(){var S=y.read();if(S==-1)throw"eof";return S},m=0,h={};;){var P=y.read();if(P==-1)break;var f=A(),_=A(),O=A(),G=String.fromCharCode(P<<8|f),B=_<<8|O;h[G]=B,m+=1}if(m!=N)throw m+" != "+N;return h})(),T=63;return function(y){for(var A=[],m=0;m<y.length;m+=1){var h=y.charCodeAt(m);if(h<128)A.push(h);else{var P=C[y.charAt(m)];typeof P=="number"?(P&255)==P?A.push(P):(A.push(P>>>8),A.push(P&255)):A.push(T)}}return A}};var t={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},n={L:1,M:0,Q:3,H:2},a={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},s=(function(){var $=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],N=1335,C=7973,T=21522,y={},A=function(m){for(var h=0;m!=0;)h+=1,m>>>=1;return h};return y.getBCHTypeInfo=function(m){for(var h=m<<10;A(h)-A(N)>=0;)h^=N<<A(h)-A(N);return(m<<10|h)^T},y.getBCHTypeNumber=function(m){for(var h=m<<12;A(h)-A(C)>=0;)h^=C<<A(h)-A(C);return m<<12|h},y.getPatternPosition=function(m){return $[m-1]},y.getMaskFunction=function(m){switch(m){case a.PATTERN000:return function(h,P){return(h+P)%2==0};case a.PATTERN001:return function(h,P){return h%2==0};case a.PATTERN010:return function(h,P){return P%3==0};case a.PATTERN011:return function(h,P){return(h+P)%3==0};case a.PATTERN100:return function(h,P){return(Math.floor(h/2)+Math.floor(P/3))%2==0};case a.PATTERN101:return function(h,P){return h*P%2+h*P%3==0};case a.PATTERN110:return function(h,P){return(h*P%2+h*P%3)%2==0};case a.PATTERN111:return function(h,P){return(h*P%3+(h+P)%2)%2==0};default:throw"bad maskPattern:"+m}},y.getErrorCorrectPolynomial=function(m){for(var h=r([1],0),P=0;P<m;P+=1)h=h.multiply(r([1,o.gexp(P)],0));return h},y.getLengthInBits=function(m,h){if(1<=h&&h<10)switch(m){case t.MODE_NUMBER:return 10;case t.MODE_ALPHA_NUM:return 9;case t.MODE_8BIT_BYTE:return 8;case t.MODE_KANJI:return 8;default:throw"mode:"+m}else if(h<27)switch(m){case t.MODE_NUMBER:return 12;case t.MODE_ALPHA_NUM:return 11;case t.MODE_8BIT_BYTE:return 16;case t.MODE_KANJI:return 10;default:throw"mode:"+m}else if(h<41)switch(m){case t.MODE_NUMBER:return 14;case t.MODE_ALPHA_NUM:return 13;case t.MODE_8BIT_BYTE:return 16;case t.MODE_KANJI:return 12;default:throw"mode:"+m}else throw"type:"+h},y.getLostPoint=function(m){for(var h=m.getModuleCount(),P=0,f=0;f<h;f+=1)for(var _=0;_<h;_+=1){for(var O=0,G=m.isDark(f,_),B=-1;B<=1;B+=1)if(!(f+B<0||h<=f+B))for(var S=-1;S<=1;S+=1)_+S<0||h<=_+S||B==0&&S==0||G==m.isDark(f+B,_+S)&&(O+=1);O>5&&(P+=3+O-5)}for(var f=0;f<h-1;f+=1)for(var _=0;_<h-1;_+=1){var q=0;m.isDark(f,_)&&(q+=1),m.isDark(f+1,_)&&(q+=1),m.isDark(f,_+1)&&(q+=1),m.isDark(f+1,_+1)&&(q+=1),(q==0||q==4)&&(P+=3)}for(var f=0;f<h;f+=1)for(var _=0;_<h-6;_+=1)m.isDark(f,_)&&!m.isDark(f,_+1)&&m.isDark(f,_+2)&&m.isDark(f,_+3)&&m.isDark(f,_+4)&&!m.isDark(f,_+5)&&m.isDark(f,_+6)&&(P+=40);for(var _=0;_<h;_+=1)for(var f=0;f<h-6;f+=1)m.isDark(f,_)&&!m.isDark(f+1,_)&&m.isDark(f+2,_)&&m.isDark(f+3,_)&&m.isDark(f+4,_)&&!m.isDark(f+5,_)&&m.isDark(f+6,_)&&(P+=40);for(var W=0,_=0;_<h;_+=1)for(var f=0;f<h;f+=1)m.isDark(f,_)&&(W+=1);var te=Math.abs(100*W/h/h-50)/5;return P+=te*10,P},y})(),o=(function(){for(var $=new Array(256),N=new Array(256),C=0;C<8;C+=1)$[C]=1<<C;for(var C=8;C<256;C+=1)$[C]=$[C-4]^$[C-5]^$[C-6]^$[C-8];for(var C=0;C<255;C+=1)N[$[C]]=C;var T={};return T.glog=function(y){if(y<1)throw"glog("+y+")";return N[y]},T.gexp=function(y){for(;y<0;)y+=255;for(;y>=256;)y-=255;return $[y]},T})();function r($,N){if(typeof $.length>"u")throw $.length+"/"+N;var C=(function(){for(var y=0;y<$.length&&$[y]==0;)y+=1;for(var A=new Array($.length-y+N),m=0;m<$.length-y;m+=1)A[m]=$[m+y];return A})(),T={};return T.getAt=function(y){return C[y]},T.getLength=function(){return C.length},T.multiply=function(y){for(var A=new Array(T.getLength()+y.getLength()-1),m=0;m<T.getLength();m+=1)for(var h=0;h<y.getLength();h+=1)A[m+h]^=o.gexp(o.glog(T.getAt(m))+o.glog(y.getAt(h)));return r(A,0)},T.mod=function(y){if(T.getLength()
Line truncated
|
||||
`),hostName:o,mtu:n.mtu,persistent_keep_alive:n.persistent_keep_alive,port:Number(n.port),psk_key:n.psk_key,server_pub_key:n.server_pub_key},l={containers:[{container:"amnezia-awg",awg:{isThirdPartyConfig:!0,last_config:JSON.stringify(r),port:String(n.port),protocol_version:a.header_protection_key?"3.1":"2",transport_proto:"udp"}}],defaultContainer:"amnezia-awg",description:t,hostName:o};return n.dns[0]&&(l.dns1=n.dns[0]),n.dns[1]&&(l.dns2=n.dns[1]),l}function Zn(i){let t="";for(let n=0;n<i.length;n+=32768)t+=String.fromCharCode(...i.subarray(n,n+32768));return btoa(t).replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,"")}async function Xn(i){let t=globalThis;if(typeof t.CompressionStream>"u")return null;try{let n=new t.Blob([i]).stream().pipeThrough(new t.CompressionStream("deflate")),a=new Uint8Array(await new t.Response(n).arrayBuffer()),s=new Uint8Array(4+a.length);return new DataView(s.buffer).setUint32(0,i.length,!1),s.set(a,4),s}catch{return null}}async function sn(i,t,n=!0){let a=new TextEncoder().encode(JSON.stringify(Qn(i,t))),s=n?await Xn(a):null;return`vpn://${Zn(s??a)}`}function Z(i){if(!i||i<0)return"0 B";let t=["B","KB","MB","GB","TB"],n=0,a=i;for(;a>=1024&&n<t.length-1;)a/=1024,n++;return`${a>=100||n===0?Math.round(a):a.toFixed(1)} ${t[n]}`}function $e(i){let t=i*8;return t<1e3?`${Math.round(t)} bit/s`:t<1e6?`${(t/1e3).toFixed(t<1e4?1:0)} kbit/s`:t<1e9?`${(t/1e6).toFixed(t<1e7?1:0)} Mbit/s`:`${(t/1e9).toFixed(1)} Gbit/s`}function ue(i,t=Date.now()/1e3){if(!i)return"never";let n=Math.max(0,Math.round(t-i));return n<60?"just now":n<3600?`${Math.floor(n/60)} min ago`:n<86400?`${Math.floor(n/3600)} h ago`:n<86400*30?`${Math.floor(n/86400)} d ago`:new Date(i*1e3).toLocaleDateString("en-GB",{day:"numeric",month:"short",year:"numeric"})}function on(i){if(!i||i<0)return"—";let t=Math.floor(i/86400),n=Math.floor(i%86400/3600),a=Math.floor(i%3600/60);return t?`${t}d ${n}h`:n?`${n}h ${a}m`:`${a}m`}function Ne(i){let t=new Date(i*1e3),n=new Date,a=t.toDateString()===n.toDateString(),s=t.toLocaleTimeString("en-GB",{hour:"2-digit",minute:"2-digit"});return a?s:`${t.toLocaleDateString("en-GB",{day:"numeric",month:"short"})} ${s}`}function _e(i){if(!i)return"";let[t,n,a]=i.split("-").map(Number);return new Date(t,n-1,a).toLocaleDateString("en-GB",{day:"numeric",month:"short",year:"numeric"})}function ze(i,t=Date.now()){if(!i)return null;let[n,a,s]=i.split("-").map(Number),o=new Date(n,a-1,s,23,59,59).getTime();return Math.ceil((o-t)/864e5)}var Ue={lan:"Home network",internet:"Internet",both:"Home network + Internet"};var rn=["computer","phone","tablet","router","other"],Se={computer:"PC",phone:"Phone",tablet:"Tablet",router:"Router",other:"Other"},Pt={active:"Active",paused:"Paused",paused_all:"Paused (everyone)",expired:"Expired",quota:"Data limit reached",hours:"Outside allowed hours",no_server:"No server"};function Re(i){let t=i.trim().split(/\s+/).filter(Boolean);if(!t.length)return"?";let n=t[0][0]??"",a=t.length>1?t[t.length-1][0]??"":t[0][1]??"";return(n+a).toUpperCase()}function rt(i){let t=n=>n.disabled?3:n.online?0:n.handshake?1:2;return i.map((n,a)=>[n,a]).sort((n,a)=>t(n[0])-t(a[0])||n[1]-a[1]).map(([n])=>n)}var ln="https://unpkg.com/maplibre-gl@4.7.1/dist/maplibre-gl",ea="https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json",ta="https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",na={online:0,"24h":86400,"7d":7*86400,"30d":30*86400},Qe=null;function aa(i){let t=window;return i.appendChild(e("link",{rel:"stylesheet",href:`${ln}.css`})),t.maplibregl?Promise.resolve(t.maplibregl):Qe||(Qe=new Promise((n,a)=>{let s=e("script",{src:`${ln}.js`});s.onload=()=>t.maplibregl?n(t.maplibregl):a(new Error("MapLibre failed to load")),s.onerror=()=>{Qe=null,a(new Error("Could not load the map library (no internet access from this browser?)"))},i.appendChild(s)}),Qe)}function lt(){let i=document.documentElement.getAttribute("data-darkmode");return i!=null?i==="true":window.matchMedia?.("(prefers-color-scheme: dark)").matches??!1}function sa(i,t,n=48){let a=(i[0]+t[0])/2,s=(i[1]+t[1])/2,o=t[0]-i[0],r=t[1]-i[1],l=Math.hypot(o,r)||1,d=Math.min(.25*l,12),p=a-r/l*d,u=s+o/l*d,c=[];for(let b=0;b<=n;b++){let g=b/n,w=1-g;c.push([w*w*i[0]+2*w*g*p+g*g*t[0],w*w*i[1]+2*w*g*u+g*g*t[1]])}return c}function ia(i,t){let n=new Map;for(let a of i.geo.points){if(i.person&&a.person!==i.person||(t==="online"?!a.online:i.now-a.ts>na[t]))continue;let s=n.get(a.device);(!s||a.online&&!s.online||a.online===s.online&&a.ts>s.ts)&&n.set(a.device,a)}return[...n.values()]}var qe=class{constructor(t,n="online",a=380){this.cb=t;this.map=null;this.gl=null;this.markers=[];this.popup=null;this.anim=0;this.data=null;this.fitted=!1;this.range=n,this.status=e("div",{class:"dl-map-status"}),this.el=e("div",{class:"dl-geomap",style:`height:${a}px`},this.status)}async mount(t){this.data=t;try{this.gl=await aa(this.el)}catch(n){this.status.textContent=n.message;return}this.map=new this.gl.Map({container:this.el,style:lt()?ea:t
Line truncated
|
||||
${c.detail}`:""}`,where:ut[c.src]??c.src,by:""}))].sort((c,b)=>c.ts-b.ts).map(({ts:c,...b})=>({time:new Date(c*1e3).toISOString(),...b})),l=new Date().toISOString().slice(0,10),d=`dawnline-activity${a?`-${a}`:""}-${l}.${n}`;if(n==="json"){ve(d,JSON.stringify(r,null,2),"application/json");return}let p=["time","category","type","person","device","detail","where","by"],u=[p.join(","),...r.map(c=>p.map(b=>va(c[b])).join(","))].join(`
|
||||
`);ve(d,u,"text/csv")}var ba=[["","Everything"],["7","Older than 7 days"],["30","Older than 30 days"],["90","Older than 90 days"]];function Ce(i,t,n,a,s,o=!1){let r=e("select",{class:"cbi-input-select"},[e("option",{value:""},"All categories"),...Xe.map(d=>e("option",{value:d,selected:d===s?"selected":null},Ge[d])),o?e("option",{value:"system",selected:s==="system"?"selected":null},"System"):""]),l=e("select",{class:"cbi-input-select"},ba.map(([d,p])=>e("option",{value:d},p)));se(i,[e("p",{class:"dl-muted"},`${t} This cannot be undone; export first if you want a copy.`),e("label",{class:"dl-fld"},[e("span",{class:"dl-fld-label"},"Category"),r]),e("label",{class:"dl-fld"},[e("span",{class:"dl-fld-label"},"Which events"),l])],[e("button",{class:"cbi-button cbi-button-neutral",click:X},"Cancel")," ",R("Clear",async()=>{let d=await U(async()=>{let p=o&&(r.value==="system"||r.value==="")?await z.serviceLogClear(l.value):{removed:0},u=r.value==="system"?{removed:0}:await z.logsClear({...n,category:r.value,older_days:l.value});return{removed:p.removed+u.removed}});d&&(X(),ne(d.removed?`${d.removed} event${d.removed===1?"":"s"} removed`:"Nothing matched","success",3e3),a())},"negative")])}function Fe(i,t,n,a){let s=i==="device"?`Clears ${n}'s daily and monthly traffic history. Their person's totals and data limit are not changed.`:i==="person"?`Clears ${n}'s traffic history and that of their devices. Their data limit starts again from zero.`:"Clears traffic history for everyone. Data limits start again from zero.";se(i==="all"?"Reset all traffic history?":`Reset traffic history for ${n}?`,[e("p",{class:"dl-muted"},s)],[e("button",{class:"cbi-button cbi-button-neutral",click:X},"Cancel")," ",R("Reset",async()=>{await U(()=>z.usageClear(i,t),"Traffic history reset")&&(X(),a())},"negative")])}var mt=null;function xa(i){return i?new Date(i*1e3).toLocaleString("en-GB",{day:"numeric",month:"short",year:"numeric",hour:"2-digit",minute:"2-digit"}):"—"}function un(i,t,n=!1){return e("div",{class:"dl-kvrow"},[e("span",{class:"dl-kvrow-k"},i),e("button",{type:"button",class:`dl-kvrow-v copy${n?" dl-mono":""}`,title:"Copy",click:()=>he(t,`${i} copied`)},[e("span",{},t),v("copy")])])}function gt(i,t){return e("div",{class:"dl-kvrow"},[e("span",{class:"dl-kvrow-k"},i),e("span",{class:"dl-kvrow-v"},t)])}function mn(i,t){if(/^\s*\[.+\]\s*$/.test(i))return e("span",{class:"dl-conf-sec"},i);let n=/^(\s*[A-Za-z0-9]+\s*=)\s*(.*)$/.exec(i);if(!n)return document.createTextNode(i);let a=/^(\s*)(PrivateKey|PresharedKey)\b/.test(i);return e("span",{},[e("span",{class:"dl-conf-k"},n[1])," ",a&&!t?e("span",{class:"dl-conf-mask"},"••••••••••••••••"):n[2]])}function wa(i){let t=!1,n=e("pre",{class:"dl-conf"}),a=()=>dom.content(n,i.conf.split(`
|
||||
`).flatMap((r,l)=>l?[`
|
||||
`,cn(r,t)]:[cn(r,t)])),i=e("button",{type:"button",class:"dl-chipbtn",click:r=>{r.preventDefault(),t=!t,dom.content(i,[v(t?"x":"key"),t?"Hide key":"Show key"]),a()}},[v("key"),"Show key"]);a();let o=new Blob([s.conf]).size;return e("div",{class:"dl-stack gap8"},[e("div",{class:"dl-filecard"},[e("span",{class:"dl-filecard-ic"},".conf"),e("span",{class:"dl-stack"},[e("span",{class:"dl-mono dl-ellipsis"},s.filename),e("span",{class:"dl-sub"},`AmneziaWG · ${o} bytes · import it in the app`)]),z([v("download")," Download"],()=>fe(s.filename,s.conf,"application/octet-stream"),"positive")]),e("details",{class:"dl-params"},[e("summary",{},[v("chevron"),e("span",{},"Configuration"),e("span",{class:"dl-spacer"}),i,e("button",{type:"button",class:"dl-chipbtn",click:r=>{r.preventDefault(),de(s.conf,"Configuration copied")}},[v("copy"),"Copy"])]),n])])}async function Nt(s,t="file"){if(!s.has_private_key)return e("div",{class:"dl-hint"},"This device generated its own keys in the browser, so its full configuration only exists on that device.");let n=await en(s,`${s.server} · ${s.person} · ${s.name}`),a={qr:()=>e("div",{class:"dl-qr-pane"},[Ae(je(s.conf),"dl-qr"),e("span",{class:"dl-sub"},"Scan with AmneziaVPN or AmneziaWG on the device.")]),key:()=>e("div",{class:"dl-stack gap8"},[e("div",{class:"dl-linkbox"},[e("span",{class:"dl-mono"},n),z("Copy",()=>de(n,"Key copied"))]),e("span",{class:"dl-sub"},"AmneziaVPN → Add server → Insert key. Keep it private.")]),file:()=>pa(s)},i=e("div",{class:"dl-connect-body"}),o=e("div",{class:"dl-seg"}),r=l=>{o.querySelectorAll("button").forEach(d=>d.classList.toggle("on",d.dataset.id===l)),dom.content(i,a[l]())};for(let[l,d]of[["file","File"],["key","Key"],["qr","QR code"]])o.appendChild(e("button",{type:"button","data-id":l,click:()=>r(l)},d));return r(t),e("div",{class:"dl-stack gap12"},[o,i])}function ha(s,t,n,a){ht?.close();let i=e("aside",{class:"dl-drawer",role:"dialog","aria-modal":"true"},[e("div",{class:"dl-drawer-head"},[s,e("button",{type:"button",class:"dl-drawer-x","aria-label":"Close",click:()=>l()},v("x"))]),e("div",{class:"dl-drawer-body"},t),n?e("div",{class:"dl-drawer-foot"},n):""]),o=e("div",{class:"dl-drawer-overlay dl-root",click:g=>{g.target===o&&l()}},i),r=g=>{g.key==="Escape"&&!document.body.classList.contains("modal-overlay-active")&&l()};function l(){document.removeEventListener("keydown",r),o.classList.remove("open"),setTimeout(()=>o.remove(),220),ht===d&&(ht=null),a()}let d={close:l,panel:i};return document.addEventListener("keydown",r),document.body.appendChild(o),requestAnimationFrame(()=>o.classList.add("open")),ht=d,d}var pn={connect:["ok","Connected","plug"],disconnect:["","Went offline","plug"],roam:["","Changed network","network"],device_added:["ok","Added","plus"],device_removed:["","Removed","trash"],device_keys:["","New keys","reset"]};function ua(s,t){let n=s.filter(a=>a.device===t&&pn[a.type]).reverse().slice(0,12);return n.length?e("div",{class:"dl-dev-log"},n.map(a=>{let[i,o,r]=pn[a.type],l=a.type==="connect"?[a.detail?e("span",{class:"dl-muted"},` from ${a.detail}`):"",a.where?e("span",{class:"dl-muted"},` · ${a.where}`):""]:a.type==="roam"?[e("span",{class:"dl-muted"},` · ${a.detail??""}`)]:a.type==="device_added"||a.type==="device_removed"||a.type==="device_keys"?[e("span",{class:"dl-muted"},be(a)==="portal"?" on the portal":be(a)==="admin"?" by you":"")]:[],d=new Date(a.ts*1e3);return e("div",{class:`dl-dev-log-row${be(a)==="admin"?" dl-ev-by-admin":""}`},[be(a)==="admin"?e("span",{class:"dl-ev-tile",title:"Done by you in LuCI"},v("admin")):e("span",{class:`dl-ev-tile ev ${i}`},v(r)),e("span",{class:"dl-row-main"},[e("span",{},o),...l]),e("span",{class:"dl-faint dl-nowrap",title:d.toLocaleString()},ce(a.ts))])})):e("div",{class:"dl-sub"},"No activity yet.")}function ga(s){return s.disabled?e("span",{class:"dl-dstat"},"Disabled"):s.online?e("span",{class:"dl-dstat ok"},"Connected"):s.handshake?e("span",{class:"dl-dstat"},`Last seen ${ce(s.handshake)}`):e("span",{class:"dl-dstat warn"},"Waiting for the first connection")}async function Ce(s,t,n,a){let i=await U(()=>N.deviceConfig(t.id));if(!i)return;let o=t,r=s,l=await Nt(i),d=e("div",{class:"dl-drawer-title"}),g=e("div",{}),f=e("div",{}),c=e("div",{},e("div",{class:"dl-sub"},"Loading…")),k=[],b=async()=>{let p=await N.events(5e3).catch(()=>null);p&&(k=p.events.filter(T=>T.device===o.id),dom.content(c,ua(p.events,o.id)))},R=()=>{let p=a?.points.find(m=>m.device===o.id&&m.ip===o.endpoint);dom.content(d,[e("span",{class:`dl-dcard-ic${o.online?" on":""}`},v(o.kind)),e("div",{class:"dl-stack"},[e("div",{class:"dl-title-row"},[e("h3",{},o.name),z([v("edit")],()=>V(),"neutral",{title:"Rename",class:"cbi-button cbi-button-neutral dl-icon-only sm"})]),e("span",{class:"dl-sub"},[`${r.name} · ${_e[o.kind]}`])])]);let T=o.spark.reduce((m,y)=>m+y,0);dom.content(g,e("div",{class:"dl-dstats"},[e("div",{class:"dl-dstats-cell wide"},[e("span",{class:"dl-metric-label"},"Status"),ga(o)]),e("div",{
Line truncated
|
||||
`),d=e("div",{class:"dl-pgrid"},[i("Junk packets","zap",o?`${o} random packet${o===1?"":"s"} of ${s.jmin}–${s.jmax} bytes before each handshake.`:"No junk packets.",["jc","jmin","jmax"]),i("Padding","archive","Random bytes in front of handshake, cookie and data packets, so their sizes do not match WireGuard.",["s1","s2","s3","s4"]),i("Packet types","key","The values that replace WireGuard’s recognisable message types.",["h1","h2","h3","h4"]),i("Signatures","globe",r,["i1","i2","i3","i4","i5"]),i("Protection","lock","AmneziaWG 3.1: encrypted headers, random tails and extra padding on data packets.",["header_protection_key","content_padding_addition","random_trailers","disable_cookies"]),i("Timing","clock","Handshake and key timers vary within these ranges instead of WireGuard’s fixed values.",["rekey_after_time","rekey_timeout","reject_after_time","keepalive_timeout","max_handshake_attempts"])]);return e("details",{class:"dl-params"},[e("summary",{},[v("chevron"),e("span",{},"Current parameters"),e("span",{class:"dl-pcount"},String(n.length)),e("span",{class:"dl-spacer"}),e("button",{type:"button",class:"dl-linkbtn",click:g=>{g.preventDefault(),de(l,"Parameters copied")}},"Copy as config")]),d])}var Rt=(s,t)=>{let n=new URLSearchParams;s&&n.set("server",s),t&&t!=="overview"&&n.set("section",t);let a=n.toString();return`${L.url("admin/network/dawnline/server")}${a?`?${a}`:""}`},nt=class{constructor(){this.noFooter=!0;this.root=e("div",{class:"dl-root"});this.section="overview";this.srvId="";this.ov={};this.pp={};this.tabsEl=e("div",{});this.headEl=e("div",{});this.secEl=e("div",{});this.bodyEl=e("div",{class:"dl-srvbody"})}async load(){let t=await N.status(31),n=t.servers.length?null:await N.setupDefaults();return[t,n]}render([t,n]){if(this.st=t,!t.servers.length&&n)return this.wizard(n);let a=new URLSearchParams(location.search),i=a.get("section")??"",o=Ca[i]??i;return fn.some(([r])=>r===o)&&(this.section=o),this.srvId=(t.servers.find(r=>r.id===a.get("server"))??t.servers[0]).id,dom.content(this.root,[this.tabsEl,this.headEl,this.secEl,this.bodyEl]),this.paint(),poll.add(async()=>{if(this.section!=="overview")return;let r=await N.status(31).catch(()=>null);if(!r||!r.servers.length)return;this.st=r;let l=this.current();dom.content(this.headEl,this.head(l)),this.paintTabs(),this.ov[l.id]?.update(r)},10),this.root}current(){return this.st.servers.find(t=>t.id===this.srvId)??this.st.servers[0]}async refresh(){let t=await N.status(31).catch(()=>null);t&&(this.st=t,t.servers.length?this.paint():location.href=Rt())}paint(){this.paintTabs(),dom.content(this.headEl,this.head(this.current())),this.paintSections(),this.showSection(this.section)}paintTabs(){let t=this.current();dom.content(this.tabsEl,e("div",{class:"dl-srvtabs",role:"tablist","aria-label":"Servers"},[...this.st.servers.map(n=>e("button",{type:"button",role:"tab",class:`dl-srvtab${n.id===t.id?" on":""}`,"aria-selected":n.id===t.id?"true":"false",click:()=>{n.id!==this.srvId&&(this.srvId=n.id,this.paint())}},[e("i",{class:`dot ${n.up?"ok":"bad"}`}),e("b",{},n.name),e("span",{class:"dl-mono dl-faint"},`:${n.port}`)])),e("button",{type:"button",class:"dl-srvtab add",click:()=>this.addServer()},[v("plus"),"Add server"])]))}paintSections(){dom.content(this.secEl,e("div",{class:"dl-seg dl-srvsections",role:"tablist","aria-label":"Server"},fn.map(([t,n])=>e("button",{type:"button",role:"tab","data-section":t,class:t===this.section?"on":"","aria-selected":t===this.section?"true":"false",click:()=>this.showSection(t)},n))))}go(t,n){let a=this.pp[this.current().id];if(n&&a)a.filter=n,a.el&&a.decorate();else if(n){let i=this.pp[this.current().id]=new Ie;i.filter=n}this.showSection(t),window.scrollTo({top:0,behavior:"smooth"})}detachKept(){let t=[...Object.values(this.ov).map(n=>n.el),...Object.values(this.pp).map(n=>n.el)];for(let n of t)n&&this.bodyEl.contains(n)&&n.remove()}showSection(t){this.section=t,this.secEl.querySelectorAll("[data-section]").forEach(r=>{let l=r.dataset.section===t;r.classList.toggle("on",l),r.setAttribute("aria-selected",l?"true":"false")});let n=this.st,a=this.current(),o={overview:()=>{let r=this.ov[a.id];return r?(r.update(n),r.el):(this.ov[a.id]=new dt(a.id,(l,d)=>this.go(l,d))).mount(n)},people:()=>{var g,f;let r=this.pp[a.id];if(r?.el)return r.poll(),r.el;let l=e("div",{},e("p",{class:"dl-muted"},"Loading people…"));return((g=this.pp)[f=a.id]??(g[f]=new Ie)).embed(n,a.id).then(c=>{l.isConnected?dom.content(l,c):l.replaceChildren(c)}),l},connection:()=>this.connection(a),access:()=>this.access(a),disguise:()=>this.disguise(a),tunnel:()=>this.tunnel(a)}[t]();this.detachKept(),dom.content(this.bodyEl,o)}head(t){let n=this.st,a=(l,d)=>e("span",{class:"dl-addrbar-seg"},[v(l),...d]),i=`${t.endpoint||"—"}:${t.port}`,o=!t.enabled||n.settings.paused_all,r=e("div",{class:"dl-actions"},[o?z([v("play")," Turn on"],async()=>{n.settings.paused_all&&!await U(()=>N.pauseAll(!1))||(t.enabled?await this.refresh():await this.save(t,{enabled
Line truncated
|
||||
`))]):"",p=u.length+(o?.update?1:0)+(r?.update?1:0),T=[i?.version?`OpenWrt ${i.version} · ${i.target}`:"",t.check?p?`${p} update${p===1?"":"s"} ready`:"everything is current":"not checked yet",t.check?`checked ${Pe(t.check.time)}`:""].filter(Boolean).join(" · ");dom.content(this.root,[e("div",{class:"dl-pagehead"},[e("div",{class:"dl-stack"},[e("h2",{class:"dl-h1"},"Updates"),e("span",{class:"dl-faint"},T)]),z([v("refresh")," Check now"],()=>this.run("check"),"neutral",d)]),b,B,$,h])}async runAwg(t,n,a){await ae(a?`Install AmneziaWG ${a}?`:"Install AmneziaWG?","Every AmneziaWG tunnel on the router restarts for a few seconds, HomeTunnel too. Devices stay configured.","Install")&&this.start(`amneziawg:${t}${n?":ru":""}`)}async runPkgs(t,n,a=t){await ae(`Update ${n}?`,`${a.join(", ")} from the OpenWrt feeds. Services that use them restart for a moment.`,"Update")&&this.start(`pkgs:${t.join(",")}`)}async run(t){t!=="check"&&!await ae(`Update ${t==="app"?"Dawnline":t}?`,"A backup is made first. The page reloads when it finishes.","Update")||this.start(t)}async start(t){if(await U(()=>N.updatesRun(t))){this.running=!0;let n=await N.updatesStatus().catch(()=>null);n&&this.paint(n)}}};function qt(s){return`${s.getFullYear()}-${String(s.getMonth()+1).padStart(2,"0")}-${String(s.getDate()).padStart(2,"0")}`}function ja(s,t,n,a=30){let i=s?new Date(`${s}T12:00:00`):new Date;return t==="day"?i.setDate(i.getDate()+n):t==="week"?i.setDate(i.getDate()+7*n):t==="month"?i.setMonth(i.getMonth()+n):t==="year"?i.setFullYear(i.getFullYear()+n):i.setDate(i.getDate()+a*n),qt(i)}var Oa={internet:"Browse the internet through your router. No access to devices at home, and home cannot reach theirs.",lan:"Reach devices at home, and home reaches theirs. Internet stays on their own connection.",both:"Home devices and the internet, all through your router. Home reaches their devices too."},yt=class{constructor(){this.id="";this.events=[];this.mapOpen=!1;this.map=null;this.parts={};this.series=[];this.devSeries={};this.refreshSeq=0;this.refreshShown=0}async load(){this.id=new URLSearchParams(location.search).get("id")??"";let[t,n,a]=await Promise.all([N.status(30),N.events(5e3).catch(()=>({events:[]})),N.personUsage(this.id,30).catch(()=>null)]);return this.series=a?.person??[],this.devSeries=a?.devices??{},[t,n.events]}render([t,n]){this.st=t,this.events=n;let a=t.people.find(l=>l.id===this.id);if(!a)return e("div",{class:"dl-empty"},[e("h3",{},"Person not found"),e("p",{},"They may have been removed."),e("a",{class:"cbi-button",href:L.url("admin/network/dawnline/server")},"Back to Servers")]);this.p=a;for(let l of["head","devices","traffic","places","activity","limits"])this.parts[l]=e("div",{});this.parts.devices.className="dl-person-devices";let i=e("div",{},[e("nav",{class:"dl-crumbs","aria-label":"Breadcrumb"},[e("a",{href:Je(a.server)},t.servers.find(l=>l.id===a.server)?.name??"Servers"),e("span",{},"/"),e("a",{href:Je(a.server)},"People"),e("span",{},"/"),e("span",{},a.name)]),this.parts.head,e("div",{class:"dl-grid-person"},[e("div",{class:"dl-col"},[this.parts.devices,this.parts.traffic,this.parts.places,this.parts.activity]),e("div",{class:"dl-col"},[this.parts.limits])])]);this.paint();let o=new URLSearchParams(location.search),r=o.get("device")&&a.devices.find(l=>l.id===o.get("device"));return r?setTimeout(()=>Ce(this.p,r,()=>this.refresh(),this.st.geo),50):o.get("add")&&setTimeout(()=>Fe(this.p,()=>this.refresh()),50),poll.add(()=>this.refresh(!0),15),i}async refresh(t=!1){let n=++this.refreshSeq,[a,i,o]=await Promise.all([N.status(30).catch(()=>null),N.events(5e3).catch(()=>null),N.personUsage(this.id,30).catch(()=>null)]);if(!a||n<this.refreshShown)return;this.refreshShown=n,this.st=a,i&&(this.events=i.events),o&&(this.series=o.person,this.devSeries=o.devices);let r=a.people.find(l=>l.id===this.id);if(!r){t||(location.href=Je(this.p?.server));return}this.p=r,this.paint(),this.map?.update(this.mapData())}async patch(t,n){var o;let a=await U(()=>N.personUpdate(this.p.id,t),n);if(!a)return;let i=this.st.people.findIndex(r=>r.id===this.p.id);(o=a.person).rate??(o.rate=this.p.rate),i>=0&&(this.st.people[i]=a.person),this.p=a.person,this.paint()}mapData(){return{geo:this.st.geo,people:this.st.people,now:this.st.now,person:this.p.id}}mapCard(){let t=e("div",{class:"dl-panel-head pad"},[e("h3",{},"Locations"),e("span",{class:"dl-spacer"}),this.st.geo.enabled?rt("30d",n=>this.map?.setRange(n),!1):"",z("Hide",()=>{this.mapOpen=!1,this.map?.destroy(),this.map=null,this.paintPlaces()},"neutral")]);return this.st.geo.enabled?(this.map=new Ue({openPerson:()=>{},openDevice:(n,a)=>{let i=this.p.devices.find(o=>o.id===a);i&&Ce(this.p,i,()=>this.refresh(),this.st.geo)}},"30d",280),requestAnimationFrame(()=>this.map.mount(this.mapData())),e("div",{class:"dl-panel flush"},[t,this.map.el])):e("div",{class:"dl-panel flush"},[t,e("div",{class:"dl-map-off"},["Locations are off. ",e("a",{href:L.url("admin/network/dawnline/settings")},"Turn them
Line truncated
|
||||
`)}d.push(R),c+=b-1}let f=z([v("more")],()=>ye(f,[{label:"Export CSV",icon:v("download"),run:()=>Le(this.st,l,"csv",t.id)},{label:"Export JSON",icon:v("download"),run:()=>Le(this.st,l,"json",t.id)},null,{label:`Clear ${t.name}'s activity`,icon:v("trash"),danger:!0,run:()=>Te(`Clear ${t.name}'s activity`,`Removes events about ${t.name} and their devices.`,{person:t.id},()=>this.refresh())}]),"neutral",{title:"Export or clear",class:"cbi-button cbi-button-neutral dl-icon-only"});dom.content(this.parts.activity,e("div",{class:"dl-panel flush"},[e("div",{class:"dl-panel-head pad"},[e("h3",{},"Activity"),e("span",{class:"dl-sub"},l.length>10?`latest 10 of ${l.length}`:""),e("span",{class:"dl-spacer"}),f]),d.length?d:e("div",{class:"dl-row dl-muted"},"Nothing yet.")]))}deviceStatus(t){return t.disabled?e("span",{class:"dl-dstat"},"Disabled"):t.online?e("span",{class:"dl-dstat ok"},"Connected"):t.handshake?e("span",{class:"dl-dstat"},`Last seen ${ce(t.handshake,this.st.now)}`):e("span",{class:"dl-dstat warn",title:"Waiting for the first connection"},"Not set up yet")}deviceBars(t){let n=(this.devSeries[t]??[]).slice(-30),a=n.map(r=>r.rx+r.tx),i=Math.max(1,...a),o=r=>new Date(`${r}T12:00:00`).toLocaleDateString("en-GB",{day:"numeric",month:"short"});return e("div",{class:"dl-dbars"},n.map((r,l)=>{let d=e("i",{class:`${a[l]?"":"zero"}${l===n.length-1?" hi":""}`});return d.style.height=`${Math.max(8,a[l]/i*100)}%`,le(d,()=>[e("div",{class:"dl-tip-title"},l===n.length-1?`Today · ${o(r.day)}`:o(r.day)),e("div",{},K(a[l]))]),d}))}paintDevices(){let t=this.p,n=()=>this.refresh(),a=st(t.devices).map(o=>{let r=()=>Ce(t,o,n,this.st.geo);return e("article",{class:`dl-dcard${o.online?" online":""}${o.disabled?" off":""}`},[e("div",{class:"dl-dcard-head"},[e("span",{class:"dl-dcard-ic"},v(o.kind)),e("button",{type:"button",class:"dl-dcard-title",click:r},[e("b",{},o.name),this.deviceStatus(o),o.config_stale?e("span",{class:"dl-pill warn dl-stale"},"Update config"):""]),z([v("more")],r,"neutral",{title:`${o.name}: connect, rename, keys, remove`,class:"cbi-button cbi-button-neutral dl-icon-only"})]),o.handshake?e("div",{class:"dl-dcard-trend"},[e("div",{class:"dl-stack"},[e("b",{},K(o.month[0]+o.month[1])),e("span",{class:"dl-sub"},"this month")]),this.deviceBars(o.id)]):o.disabled?e("div",{class:"dl-sub"},`${_e[o.kind]} · created ${ce(o.created,this.st.now)} ${o.created_by==="portal"?"in the portal":"by you"}.`):e("div",{class:"dl-chips-row"},[e("button",{type:"button",class:"dl-chipbtn",click:()=>this.showDeviceQr(o)},[v("qr"),"Show QR"]),e("button",{type:"button",class:"dl-chipbtn",click:()=>this.downloadConfig(o)},[v("download"),"Config"])])])}),i=t.devices.length>=t.device_limit;a.push(e("button",{type:"button",class:"dl-dslot add",click:()=>Fe(t,n)},[e("span",{class:"dl-dslot-ic"},v("plus")),e("span",{class:"dl-stack"},[e("b",{},"Add device"),i?e("span",{class:"dl-sub"},`Over the limit · ${t.devices.length} of ${t.device_limit}`):""])])),dom.content(this.parts.devices,e("section",{class:"dl-devsec"},[e("div",{class:"dl-panel-head"},[e("h3",{},"Devices"),e("span",{class:"dl-sub"},`${t.online} online`)]),e("div",{class:"dl-dgrid"},a)]))}paintLimits(){let t=this.p,n=e("div",{class:"dl-seg wide",role:"radiogroup","aria-label":"Access"},["internet","lan","both"].map(h=>e("button",{type:"button",role:"radio",class:t.access===h?"on":"","aria-checked":t.access===h?"true":"false",click:()=>t.access!==h&&this.patch({access:h},`Access: ${Oe[h]}`)},[v(h==="internet"?"globe":h==="lan"?"home":"shield"),h==="internet"?"Internet":h==="lan"?"Home":"Both"]))),a=Ne(t.expires),i=e("input",{type:"date",class:"dl-date-hidden",value:t.expires,tabindex:"-1","aria-hidden":"true"});i.addEventListener("change",()=>i.value&&this.patch({expires:i.value},`Access until ${$e(i.value)}`));let o=(h,p,T)=>{let m=ja(t.expires&&(a??-1)>=0?t.expires:"",h,p);return this.patch({expires:m},`Access until ${$e(m)}`),T},r=[["week",1,"+1 week"],["month",1,"+1 month"],["month",3,"+3 months"],["year",1,"+1 year"]].map(([h,p,T])=>e("button",{type:"button",class:"dl-chipbtn",click:()=>o(h,p,T)},T)),l=e("span",{class:"dl-datechip"},[e("button",{type:"button",class:"dl-chipbtn",click:()=>{try{i.showPicker()}catch{i.focus()}}},[v("calendar"),t.expires?$e(t.expires):"Date"]),i]),d={pause:"pause access",notify:"keep access",remove:"remove their devices"}[t.expire_action],g=e("div",{class:"dl-tile2"},[e("div",{class:"dl-tile2-label"},[e("span",{},"Access ends"),t.expires?e("span",{class:a!=null&&a<0?"dl-bad":a!=null&&a<=t.expire_warn?"dl-warn":"dl-ok"},a!=null&&a<0?"ended":`${a} day${a===1?"":"s"} left`):e("span",{class:"dl-faint"},"no end date")]),e("div",{class:"dl-chips-row"},[...r,l,t.expires?e("button",{type:"button",class:"dl-chipbtn",click:()=>this.patch({expires:""},"No end date")},"No end"):""]),e("div",{class:"dl-tile2-foot"},[e("span",{class:"dl-muted"},`When it ends: ${d}${t.expire_warn?`, warn ${t.expire_warn} day${t.expire_warn===1?"":"s"} before`:""}`),e("a"
Line truncated
|
||||
`,mn(r,t)]:[mn(r,t)])),s=e("button",{type:"button",class:"dl-chipbtn",click:r=>{r.preventDefault(),t=!t,dom.content(s,[v(t?"x":"key"),t?"Hide key":"Show key"]),a()}},[v("key"),"Show key"]);a();let o=new Blob([i.conf]).size;return e("div",{class:"dl-stack gap8"},[e("div",{class:"dl-filecard"},[e("span",{class:"dl-filecard-ic"},".conf"),e("span",{class:"dl-stack"},[e("span",{class:"dl-mono dl-ellipsis"},i.filename),e("span",{class:"dl-sub"},`AmneziaWG · ${o} bytes · import it in the app`)]),R([v("download")," Download"],()=>ve(i.filename,i.conf,"application/octet-stream"),"positive")]),e("details",{class:"dl-params"},[e("summary",{},[v("chevron"),e("span",{},"Configuration"),e("span",{class:"dl-spacer"}),s,e("button",{type:"button",class:"dl-chipbtn",click:r=>{r.preventDefault(),he(i.conf,"Configuration copied")}},[v("copy"),"Copy"])]),n])])}async function It(i,t="file"){if(!i.has_private_key)return e("div",{class:"dl-hint"},"This device generated its own keys in the browser, so its full configuration only exists on that device.");let n=await sn(i,`${i.server} · ${i.person} · ${i.name}`),a={qr:()=>e("div",{class:"dl-qr-pane"},[Pe(Oe(i.conf),"dl-qr"),e("span",{class:"dl-sub"},"Scan with AmneziaVPN or AmneziaWG on the device.")]),key:()=>e("div",{class:"dl-stack gap8"},[e("div",{class:"dl-linkbox"},[e("span",{class:"dl-mono"},n),R("Copy",()=>he(n,"Key copied"))]),e("span",{class:"dl-sub"},"AmneziaVPN → Add server → Insert key. Keep it private.")]),file:()=>wa(i)},s=e("div",{class:"dl-connect-body"}),o=e("div",{class:"dl-seg"}),r=l=>{o.querySelectorAll("button").forEach(d=>d.classList.toggle("on",d.dataset.id===l)),dom.content(s,a[l]())};for(let[l,d]of[["file","File"],["key","Key"],["qr","QR code"]])o.appendChild(e("button",{type:"button","data-id":l,click:()=>r(l)},d));return r(t),e("div",{class:"dl-stack gap12"},[o,s])}function ya(i,t,n,a){mt?.close();let s=e("aside",{class:"dl-drawer",role:"dialog","aria-modal":"true"},[e("div",{class:"dl-drawer-head"},[i,e("button",{type:"button",class:"dl-drawer-x","aria-label":"Close",click:()=>l()},v("x"))]),e("div",{class:"dl-drawer-body"},t),n?e("div",{class:"dl-drawer-foot"},n):""]),o=e("div",{class:"dl-drawer-overlay dl-root",click:p=>{p.target===o&&l()}},s),r=p=>{p.key==="Escape"&&!document.body.classList.contains("modal-overlay-active")&&l()};function l(){document.removeEventListener("keydown",r),o.classList.remove("open"),setTimeout(()=>o.remove(),220),mt===d&&(mt=null),a()}let d={close:l,panel:s};return document.addEventListener("keydown",r),document.body.appendChild(o),requestAnimationFrame(()=>o.classList.add("open")),mt=d,d}var gn={connect:["ok","Connected","plug"],disconnect:["","Went offline","plug"],roam:["","Changed network","network"],device_added:["ok","Added","plus"],device_removed:["","Removed","trash"],device_keys:["","New keys","reset"]};function ka(i,t){let n=i.filter(a=>a.device===t&&gn[a.type]).reverse().slice(0,12);return n.length?e("div",{class:"dl-dev-log"},n.map(a=>{let[s,o,r]=gn[a.type],l=a.type==="connect"?[a.detail?e("span",{class:"dl-muted"},` from ${a.detail}`):"",a.where?e("span",{class:"dl-muted"},` · ${a.where}`):""]:a.type==="roam"?[e("span",{class:"dl-muted"},` · ${a.detail??""}`)]:a.type==="device_added"||a.type==="device_removed"||a.type==="device_keys"?[e("span",{class:"dl-muted"},xe(a)==="portal"?" on the portal":xe(a)==="admin"?" by you":"")]:[],d=new Date(a.ts*1e3);return e("div",{class:`dl-dev-log-row${xe(a)==="admin"?" dl-ev-by-admin":""}`},[xe(a)==="admin"?e("span",{class:"dl-ev-tile",title:"Done by you in LuCI"},v("admin")):e("span",{class:`dl-ev-tile ev ${s}`},v(r)),e("span",{class:"dl-row-main"},[e("span",{},o),...l]),e("span",{class:"dl-faint dl-nowrap",title:d.toLocaleString()},ue(a.ts))])})):e("div",{class:"dl-sub"},"No activity yet.")}function $a(i){return i.disabled?e("span",{class:"dl-dstat"},"Disabled"):i.online?e("span",{class:"dl-dstat ok"},"Connected"):i.handshake?e("span",{class:"dl-dstat"},`Last seen ${ue(i.handshake)}`):e("span",{class:"dl-dstat warn"},"Waiting for the first connection")}async function De(i,t,n,a){let s=await U(()=>z.deviceConfig(t.id));if(!s)return;let o=t,r=i,l=await It(s),d=e("div",{class:"dl-drawer-title"}),p=e("div",{}),u=e("div",{}),c=e("div",{},e("div",{class:"dl-sub"},"Loading…")),b=[],g=async()=>{let h=await z.events(5e3).catch(()=>null);h&&(b=h.events.filter(P=>P.device===o.id),dom.content(c,ka(h.events,o.id)))},w=()=>{let h=a?.points.find(f=>f.device===o.id&&f.ip===o.endpoint);dom.content(d,[e("span",{class:`dl-dcard-ic${o.online?" on":""}`},v(o.kind)),e("div",{class:"dl-stack"},[e("div",{class:"dl-title-row"},[e("h3",{},o.name),R([v("edit")],()=>Y(),"neutral",{title:"Rename",class:"cbi-button cbi-button-neutral dl-icon-only sm"})]),e("span",{class:"dl-sub"},[`${r.name} · ${Se[o.kind]}`])])]);let P=o.spark.reduce((f,_)=>f+_,0);dom.content(p,e("div",{class:"dl-dstats"},[e("div",{class:"dl-dstats-cell wide"},[e("span",{class:"dl-metric-label"},"Status"),$a(o)]),e("div",{
Line truncated
|
||||
`),d=e("div",{class:"dl-pgrid"},[s("Junk packets","zap",o?`${o} random packet${o===1?"":"s"} of ${i.jmin}–${i.jmax} bytes before each handshake.`:"No junk packets.",["jc","jmin","jmax"]),s("Padding","archive","Random bytes in front of handshake, cookie and data packets, so their sizes do not match WireGuard.",["s1","s2","s3","s4"]),s("Packet types","key","The values that replace WireGuard’s recognisable message types.",["h1","h2","h3","h4"]),s("Signatures","globe",r,["i1","i2","i3","i4","i5"]),s("Protection","lock","AmneziaWG 3.1: encrypted headers, random tails and extra padding on data packets.",["header_protection_key","content_padding_addition","random_trailers","disable_cookies"]),s("Timing","clock","Handshake and key timers vary within these ranges instead of WireGuard’s fixed values.",["rekey_after_time","rekey_timeout","reject_after_time","keepalive_timeout","max_handshake_attempts"])]);return e("details",{class:"dl-params"},[e("summary",{},[v("chevron"),e("span",{},"Current parameters"),e("span",{class:"dl-pcount"},String(n.length)),e("span",{class:"dl-spacer"}),e("button",{type:"button",class:"dl-linkbtn",click:p=>{p.preventDefault(),he(l,"Parameters copied")}},"Copy as config")]),d])}var jt=(i,t)=>{let n=new URLSearchParams;i&&n.set("server",i),t&&t!=="overview"&&n.set("section",t);let a=n.toString();return`${L.url("admin/network/dawnline/server")}${a?`?${a}`:""}`},st=class{constructor(){this.noFooter=!0;this.root=e("div",{class:"dl-root"});this.section="overview";this.srvId="";this.ov={};this.pp={};this.tabsEl=e("div",{});this.headEl=e("div",{});this.secEl=e("div",{});this.bodyEl=e("div",{class:"dl-srvbody"})}async load(){let t=await z.status(31),n=t.servers.length?null:await z.setupDefaults();return[t,n]}render([t,n]){if(this.st=t,!t.servers.length&&n)return this.wizard(n);let a=new URLSearchParams(location.search),s=a.get("section")??"",o=Ua[s]??s;return Sn.some(([r])=>r===o)&&(this.section=o),this.srvId=(t.servers.find(r=>r.id===a.get("server"))??t.servers[0]).id,dom.content(this.root,[this.tabsEl,this.headEl,this.secEl,this.bodyEl]),this.paint(),poll.add(async()=>{if(this.section!=="overview")return;let r=await z.status(31).catch(()=>null);if(!r||!r.servers.length)return;this.st=r;let l=this.current();dom.content(this.headEl,this.head(l)),this.paintTabs(),this.ov[l.id]?.update(r)},10),this.root}current(){return this.st.servers.find(t=>t.id===this.srvId)??this.st.servers[0]}async refresh(){let t=await z.status(31).catch(()=>null);t&&(this.st=t,t.servers.length?this.paint():location.href=jt())}paint(){this.paintTabs(),dom.content(this.headEl,this.head(this.current())),this.paintSections(),this.showSection(this.section)}paintTabs(){let t=this.current();dom.content(this.tabsEl,e("div",{class:"dl-srvtabs",role:"tablist","aria-label":"Servers"},[...this.st.servers.map(n=>e("button",{type:"button",role:"tab",class:`dl-srvtab${n.id===t.id?" on":""}`,"aria-selected":n.id===t.id?"true":"false",click:()=>{n.id!==this.srvId&&(this.srvId=n.id,this.paint())}},[e("i",{class:`dot ${n.up?"ok":"bad"}`}),e("b",{},n.name),e("span",{class:"dl-mono dl-faint"},`:${n.port}`)])),e("button",{type:"button",class:"dl-srvtab add",click:()=>this.addServer()},[v("plus"),"Add server"])]))}paintSections(){dom.content(this.secEl,e("div",{class:"dl-seg dl-srvsections",role:"tablist","aria-label":"Server"},Sn.map(([t,n])=>e("button",{type:"button",role:"tab","data-section":t,class:t===this.section?"on":"","aria-selected":t===this.section?"true":"false",click:()=>this.showSection(t)},n))))}go(t,n){let a=this.pp[this.current().id];if(n&&a)a.filter=n,a.el&&a.decorate();else if(n){let s=this.pp[this.current().id]=new Be;s.filter=n}this.showSection(t),window.scrollTo({top:0,behavior:"smooth"})}detachKept(){let t=[...Object.values(this.ov).map(n=>n.el),...Object.values(this.pp).map(n=>n.el)];for(let n of t)n&&this.bodyEl.contains(n)&&n.remove()}showSection(t){this.section=t,this.secEl.querySelectorAll("[data-section]").forEach(r=>{let l=r.dataset.section===t;r.classList.toggle("on",l),r.setAttribute("aria-selected",l?"true":"false")});let n=this.st,a=this.current(),o={overview:()=>{let r=this.ov[a.id];return r?(r.update(n),r.el):(this.ov[a.id]=new pt(a.id,(l,d)=>this.go(l,d))).mount(n)},people:()=>{var p,u;let r=this.pp[a.id];if(r?.el)return r.poll(),r.el;let l=e("div",{},e("p",{class:"dl-muted"},"Loading people…"));return((p=this.pp)[u=a.id]??(p[u]=new Be)).embed(n,a.id).then(c=>{l.isConnected?dom.content(l,c):l.replaceChildren(c)}),l},connection:()=>this.connection(a),access:()=>this.access(a),disguise:()=>this.disguise(a),tunnel:()=>this.tunnel(a)}[t]();this.detachKept(),dom.content(this.bodyEl,o)}head(t){let n=this.st,a=(l,d)=>e("span",{class:"dl-addrbar-seg"},[v(l),...d]),s=`${t.endpoint||"—"}:${t.port}`,o=!t.enabled||n.settings.paused_all,r=e("div",{class:"dl-actions"},[o?R([v("play")," Turn on"],async()=>{n.settings.paused_all&&!await U(()=>z.pauseAll(!1))||(t.enabled?await this.refresh():await this.save(t,{enabled
Line truncated
|
||||
`))]):"",h=y.length+(o?.update?1:0)+(r?.update?1:0),P=[s?.version?`OpenWrt ${s.version} · ${s.target}`:"",t.check?h?`${h} update${h===1?"":"s"} ready`:"everything is current":"not checked yet",t.check?`checked ${Ne(t.check.time)}`:""].filter(Boolean).join(" · ");dom.content(this.root,[e("div",{class:"dl-pagehead"},[e("div",{class:"dl-stack"},[e("h2",{class:"dl-h1"},"Updates"),e("span",{class:"dl-faint"},P)]),R([v("refresh")," Check now"],()=>this.run("check"),"neutral",d)]),g,j,A,m])}async runAwg(t,n,a){await re(a?`Install AmneziaWG ${a}?`:"Install AmneziaWG?","Every AmneziaWG tunnel on the router restarts for a few seconds, HomeTunnel too. Devices stay configured.","Install")&&this.start(`amneziawg:${t}${n?":ru":""}`)}async runPkgs(t,n,a=t){await re(`Update ${n}?`,`${a.join(", ")} from the OpenWrt feeds. Services that use them restart for a moment.`,"Update")&&this.start(`pkgs:${t.join(",")}`)}async run(t){t!=="check"&&!await re(`Update ${t==="app"?"Dawnline":t}?`,"A backup is made first. The page reloads when it finishes.","Update")||this.start(t)}async start(t){if(await U(()=>z.updatesRun(t))){this.running=!0;let n=await z.updatesStatus().catch(()=>null);n&&this.paint(n)}}};function Kt(i){return`${i.getFullYear()}-${String(i.getMonth()+1).padStart(2,"0")}-${String(i.getDate()).padStart(2,"0")}`}function Za(i,t,n,a=30){let s=i?new Date(`${i}T12:00:00`):new Date;return t==="day"?s.setDate(s.getDate()+n):t==="week"?s.setDate(s.getDate()+7*n):t==="month"?s.setMonth(s.getMonth()+n):t==="year"?s.setFullYear(s.getFullYear()+n):s.setDate(s.getDate()+a*n),Kt(s)}var Xa={internet:"Browse the internet through your router. No access to devices at home, and home cannot reach theirs.",lan:"Reach devices at home, and home reaches theirs. Internet stays on their own connection.",both:"Home devices and the internet, all through your router. Home reaches their devices too."},Lt=class{constructor(){this.id="";this.events=[];this.mapOpen=!1;this.map=null;this.parts={};this.series=[];this.devSeries={};this.refreshSeq=0;this.refreshShown=0}async load(){this.id=new URLSearchParams(location.search).get("id")??"";let[t,n,a]=await Promise.all([z.status(30),z.events(5e3).catch(()=>({events:[]})),z.personUsage(this.id,30).catch(()=>null)]);return this.series=a?.person??[],this.devSeries=a?.devices??{},[t,n.events]}render([t,n]){this.st=t,this.events=n;let a=t.people.find(l=>l.id===this.id);if(!a)return e("div",{class:"dl-empty"},[e("h3",{},"Person not found"),e("p",{},"They may have been removed."),e("a",{class:"cbi-button",href:L.url("admin/network/dawnline/server")},"Back to Servers")]);this.p=a;for(let l of["head","devices","traffic","places","activity","limits"])this.parts[l]=e("div",{});this.parts.devices.className="dl-person-devices";let s=e("div",{},[e("nav",{class:"dl-crumbs","aria-label":"Breadcrumb"},[e("a",{href:Ze(a.server)},t.servers.find(l=>l.id===a.server)?.name??"Servers"),e("span",{},"/"),e("a",{href:Ze(a.server)},"People"),e("span",{},"/"),e("span",{},a.name)]),this.parts.head,e("div",{class:"dl-grid-person"},[e("div",{class:"dl-col"},[this.parts.devices,this.parts.traffic,this.parts.places,this.parts.activity]),e("div",{class:"dl-col"},[this.parts.limits])])]);this.paint();let o=new URLSearchParams(location.search),r=o.get("device")&&a.devices.find(l=>l.id===o.get("device"));return r?setTimeout(()=>De(this.p,r,()=>this.refresh(),this.st.geo),50):o.get("add")&&setTimeout(()=>Ke(this.p,()=>this.refresh()),50),poll.add(()=>this.refresh(!0),15),s}async refresh(t=!1){let n=++this.refreshSeq,[a,s,o]=await Promise.all([z.status(30).catch(()=>null),z.events(5e3).catch(()=>null),z.personUsage(this.id,30).catch(()=>null)]);if(!a||n<this.refreshShown)return;this.refreshShown=n,this.st=a,s&&(this.events=s.events),o&&(this.series=o.person,this.devSeries=o.devices);let r=a.people.find(l=>l.id===this.id);if(!r){t||(location.href=Ze(this.p?.server));return}this.p=r,this.paint(),this.map?.update(this.mapData())}async patch(t,n){var o;let a=await U(()=>z.personUpdate(this.p.id,t),n);if(!a)return;let s=this.st.people.findIndex(r=>r.id===this.p.id);(o=a.person).rate??(o.rate=this.p.rate),s>=0&&(this.st.people[s]=a.person),this.p=a.person,this.paint()}mapData(){return{geo:this.st.geo,people:this.st.people,now:this.st.now,person:this.p.id}}mapCard(){let t=e("div",{class:"dl-panel-head pad"},[e("h3",{},"Locations"),e("span",{class:"dl-spacer"}),this.st.geo.enabled?dt("30d",n=>this.map?.setRange(n),!1):"",R("Hide",()=>{this.mapOpen=!1,this.map?.destroy(),this.map=null,this.paintPlaces()},"neutral")]);return this.st.geo.enabled?(this.map=new qe({openPerson:()=>{},openDevice:(n,a)=>{let s=this.p.devices.find(o=>o.id===a);s&&De(this.p,s,()=>this.refresh(),this.st.geo)}},"30d",280),requestAnimationFrame(()=>this.map.mount(this.mapData())),e("div",{class:"dl-panel flush"},[t,this.map.el])):e("div",{class:"dl-panel flush"},[t,e("div",{class:"dl-map-off"},["Locations are off. ",e("a",{href:L.url("admin/network/dawnline/settings")},"Turn them
Line truncated
|
||||
`)}d.push(w),c+=g-1}let u=R([v("more")],()=>we(u,[{label:"Export CSV",icon:v("download"),run:()=>Le(this.st,l,"csv",t.id)},{label:"Export JSON",icon:v("download"),run:()=>Le(this.st,l,"json",t.id)},null,{label:`Clear ${t.name}'s activity`,icon:v("trash"),danger:!0,run:()=>Ce(`Clear ${t.name}'s activity`,`Removes events about ${t.name} and their devices.`,{person:t.id},()=>this.refresh())}]),"neutral",{title:"Export or clear",class:"cbi-button cbi-button-neutral dl-icon-only"});dom.content(this.parts.activity,e("div",{class:"dl-panel flush"},[e("div",{class:"dl-panel-head pad"},[e("h3",{},"Activity"),e("span",{class:"dl-sub"},l.length>10?`latest 10 of ${l.length}`:""),e("span",{class:"dl-spacer"}),u]),d.length?d:e("div",{class:"dl-row dl-muted"},"Nothing yet.")]))}deviceStatus(t){return t.disabled?e("span",{class:"dl-dstat"},"Disabled"):t.online?e("span",{class:"dl-dstat ok"},"Connected"):t.handshake?e("span",{class:"dl-dstat"},`Last seen ${ue(t.handshake,this.st.now)}`):e("span",{class:"dl-dstat warn",title:"Waiting for the first connection"},"Not set up yet")}deviceBars(t){let n=(this.devSeries[t]??[]).slice(-30),a=n.map(r=>r.rx+r.tx),s=Math.max(1,...a),o=r=>new Date(`${r}T12:00:00`).toLocaleDateString("en-GB",{day:"numeric",month:"short"});return e("div",{class:"dl-dbars"},n.map((r,l)=>{let d=e("i",{class:`${a[l]?"":"zero"}${l===n.length-1?" hi":""}`});return d.style.height=`${Math.max(8,a[l]/s*100)}%`,pe(d,()=>[e("div",{class:"dl-tip-title"},l===n.length-1?`Today · ${o(r.day)}`:o(r.day)),e("div",{},Z(a[l]))]),d}))}paintDevices(){let t=this.p,n=()=>this.refresh(),a=rt(t.devices).map(o=>{let r=()=>De(t,o,n,this.st.geo);return e("article",{class:`dl-dcard${o.online?" online":""}${o.disabled?" off":""}`},[e("div",{class:"dl-dcard-head"},[e("span",{class:"dl-dcard-ic"},v(o.kind)),e("button",{type:"button",class:"dl-dcard-title",click:r},[e("b",{},o.name),this.deviceStatus(o),o.config_stale?e("span",{class:"dl-pill warn dl-stale"},"Update config"):""]),R([v("more")],r,"neutral",{title:`${o.name}: connect, rename, keys, remove`,class:"cbi-button cbi-button-neutral dl-icon-only"})]),o.handshake?e("div",{class:"dl-dcard-trend"},[e("div",{class:"dl-stack"},[e("b",{},Z(o.month[0]+o.month[1])),e("span",{class:"dl-sub"},"this month")]),this.deviceBars(o.id)]):o.disabled?e("div",{class:"dl-sub"},`${Se[o.kind]} · created ${ue(o.created,this.st.now)} ${o.created_by==="portal"?"in the portal":"by you"}.`):e("div",{class:"dl-chips-row"},[e("button",{type:"button",class:"dl-chipbtn",click:()=>this.showDeviceQr(o)},[v("qr"),"Show QR"]),e("button",{type:"button",class:"dl-chipbtn",click:()=>this.downloadConfig(o)},[v("download"),"Config"])])])}),s=t.devices.length>=t.device_limit;a.push(e("button",{type:"button",class:"dl-dslot add",click:()=>Ke(t,n)},[e("span",{class:"dl-dslot-ic"},v("plus")),e("span",{class:"dl-stack"},[e("b",{},"Add device"),s?e("span",{class:"dl-sub"},`Over the limit · ${t.devices.length} of ${t.device_limit}`):""])])),dom.content(this.parts.devices,e("section",{class:"dl-devsec"},[e("div",{class:"dl-panel-head"},[e("h3",{},"Devices"),e("span",{class:"dl-sub"},`${t.online} online`)]),e("div",{class:"dl-dgrid"},a)]))}paintLimits(){let t=this.p,n=e("div",{class:"dl-seg wide",role:"radiogroup","aria-label":"Access"},["internet","lan","both"].map(m=>e("button",{type:"button",role:"radio",class:t.access===m?"on":"","aria-checked":t.access===m?"true":"false",click:()=>t.access!==m&&this.patch({access:m},`Access: ${Ue[m]}`)},[v(m==="internet"?"globe":m==="lan"?"home":"shield"),m==="internet"?"Internet":m==="lan"?"Home":"Both"]))),a=ze(t.expires),s=e("input",{type:"date",class:"dl-date-hidden",value:t.expires,tabindex:"-1","aria-hidden":"true"});s.addEventListener("change",()=>s.value&&this.patch({expires:s.value},`Access until ${_e(s.value)}`));let o=(m,h,P)=>{let f=Za(t.expires&&(a??-1)>=0?t.expires:"",m,h);return this.patch({expires:f},`Access until ${_e(f)}`),P},r=[["week",1,"+1 week"],["month",1,"+1 month"],["month",3,"+3 months"],["year",1,"+1 year"]].map(([m,h,P])=>e("button",{type:"button",class:"dl-chipbtn",click:()=>o(m,h,P)},P)),l=e("span",{class:"dl-datechip"},[e("button",{type:"button",class:"dl-chipbtn",click:()=>{try{s.showPicker()}catch{s.focus()}}},[v("calendar"),t.expires?_e(t.expires):"Date"]),s]),d={pause:"pause access",notify:"keep access",remove:"remove their devices"}[t.expire_action],p=e("div",{class:"dl-tile2"},[e("div",{class:"dl-tile2-label"},[e("span",{},"Access ends"),t.expires?e("span",{class:a!=null&&a<0?"dl-bad":a!=null&&a<=t.expire_warn?"dl-warn":"dl-ok"},a!=null&&a<0?"ended":`${a} day${a===1?"":"s"} left`):e("span",{class:"dl-faint"},"no end date")]),e("div",{class:"dl-chips-row"},[...r,l,t.expires?e("button",{type:"button",class:"dl-chipbtn",click:()=>this.patch({expires:""},"No end date")},"No end"):""]),e("div",{class:"dl-tile2-foot"},[e("span",{class:"dl-muted"},`When it ends: ${d}${t.expire_warn?`, warn ${t.expire_warn} day${t.expire_warn===1?"":"s"} before`:""}`),e("a"
Line truncated
|
||||
@@ -20,6 +20,7 @@ import * as ops from 'dawnline.ops';
|
||||
import * as geo from 'dawnline.geo';
|
||||
import * as watchdog from 'dawnline.watchdog';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as bonjour from 'dawnline.bonjour';
|
||||
|
||||
const TICK = 60 * 1000;
|
||||
const FLUSH_EVERY = 3600;
|
||||
@@ -151,6 +152,14 @@ function place_of(ip) {
|
||||
return pl ? join(' · ', filter([ pl.city, pl.org ], (x) => x)) : null;
|
||||
}
|
||||
|
||||
/** Connections from home: the DHCP name of the address, as it is now. */
|
||||
function named(e) {
|
||||
let h = net.event_hosts(e, net.lan_names());
|
||||
if (h)
|
||||
e.hosts = h;
|
||||
return e;
|
||||
}
|
||||
|
||||
function check_devices(m, lv, events) {
|
||||
for (let id, d in lv) {
|
||||
let dev = m.devices[id];
|
||||
@@ -169,12 +178,12 @@ function check_devices(m, lv, events) {
|
||||
delete offline_ticks[id];
|
||||
if (was != null && was != d.online) {
|
||||
if (d.online)
|
||||
push(events, { type: 'connect', person: dev.person, device: id, detail: d.endpoint, where: place_of(d.endpoint) });
|
||||
push(events, named({ type: 'connect', person: dev.person, device: id, detail: d.endpoint, where: place_of(d.endpoint) }));
|
||||
else
|
||||
push(events, { type: 'disconnect', person: dev.person, device: id });
|
||||
}
|
||||
else if (d.online && last_endpoint[id] && d.endpoint && last_endpoint[id] != d.endpoint)
|
||||
push(events, { type: 'roam', person: dev.person, device: id, detail: `${last_endpoint[id]} → ${d.endpoint}` });
|
||||
push(events, named({ type: 'roam', person: dev.person, device: id, detail: `${last_endpoint[id]} → ${d.endpoint}` }));
|
||||
last_online[id] = d.online;
|
||||
if (d.endpoint)
|
||||
last_endpoint[id] = d.endpoint;
|
||||
@@ -348,6 +357,12 @@ function tick() {
|
||||
check_wan(m);
|
||||
}
|
||||
catch (e) {}
|
||||
try {
|
||||
bonjour.sync(m);
|
||||
}
|
||||
catch (e) {
|
||||
slog('dawnline', 'error', `failed: ${e.message}`, null, 'Find home devices');
|
||||
}
|
||||
nightly_backup();
|
||||
try {
|
||||
check_geo(m);
|
||||
|
||||
@@ -28,7 +28,7 @@ const AWG_RU = 'luci-i18n-amneziawg-ru';
|
||||
// OpenWrt packages Dawnline runs on (the Updates tab groups and names them).
|
||||
// What Dawnline itself adds to OpenWrt (the rest of LuCI, ucode, rpcd and uhttpd is the
|
||||
// stock system): the home-like link, and HTTPS plus certificates for the personal portal.
|
||||
const SYS_PKGS = [ 'ip-full', 'kmod-veth', 'libustream-openssl', 'openssl-util', 'acme', 'acme-acmesh-dnsapi', 'luci-app-acme' ];
|
||||
const SYS_PKGS = [ 'ip-full', 'kmod-veth', 'libustream-openssl', 'openssl-util', 'acme', 'acme-acmesh-dnsapi', 'luci-app-acme', 'umdns' ];
|
||||
// Packages released together with each of the above, updated as a set so OpenSSL never ends up
|
||||
// half old and half new.
|
||||
const PKG_FAMILY = [
|
||||
@@ -463,6 +463,9 @@ function install_pkgs(arg) {
|
||||
// The portal's HTTPS runs in uhttpd. Restart after this job saved its state.
|
||||
let touched = [ ...names, ...have ];
|
||||
// A missing piece arrived: set up what waited for it (the portal, the home-like link).
|
||||
// Bonjour: OpenWrt's mDNS daemon starts at once; the agent publishes what it finds.
|
||||
if (index(missing, 'umdns') >= 0)
|
||||
run('/etc/init.d/umdns enable; /etc/init.d/umdns start');
|
||||
if (length(missing) && length(filter(missing, (n) => match(n, /^(openssl-util|libustream|ip-full|kmod-veth)/))))
|
||||
run('( sleep 3; /usr/bin/dawnline apply; /etc/init.d/uhttpd restart; /etc/init.d/dawnline restart ) </dev/null >/dev/null 2>&1 &');
|
||||
else if (length(filter(touched, (n) => match(n, /^(libustream|libopenssl)/))))
|
||||
|
||||
@@ -5,7 +5,7 @@ import { cursor } from 'uci';
|
||||
import { readfile, stat } from 'fs';
|
||||
import {
|
||||
q, sh, sh_out, sh_bg, ensure_dir, read_json, write_json, parse_cidr, cidr_str, cidr_overlaps, int2ip,
|
||||
ip2int, valid_host, rand_int, lock, unlock, uniq, slog_clear, admin_log, VERSION, RUN_DIR, DATA_DIR
|
||||
ip2int, valid_host, rand_int, rand_hex, lock, unlock, uniq, slog_clear, admin_log, VERSION, RUN_DIR, DATA_DIR
|
||||
} from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as live from 'dawnline.live';
|
||||
@@ -16,6 +16,8 @@ import * as geo from 'dawnline.geo';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as loop from 'dawnline.loop';
|
||||
import * as watchdog from 'dawnline.watchdog';
|
||||
import * as access from 'dawnline.access';
|
||||
import * as bonjour from 'dawnline.bonjour';
|
||||
|
||||
function wrap(fn) {
|
||||
return function(req) {
|
||||
@@ -96,6 +98,18 @@ function geo_view(m, usage, dmp) {
|
||||
|
||||
/* ---------- status ---------- */
|
||||
|
||||
/** Older connections from home get the DHCP name their address has now. */
|
||||
function with_hosts(ev) {
|
||||
let names = null;
|
||||
for (let e in ev)
|
||||
if ((e.type == 'connect' || e.type == 'roam') && !e.hosts) {
|
||||
let h = net.event_hosts(e, names ??= net.lan_names());
|
||||
if (h)
|
||||
e.hosts = h;
|
||||
}
|
||||
return ev;
|
||||
}
|
||||
|
||||
function status(a) {
|
||||
let m = core.load();
|
||||
let usage = core.load_usage();
|
||||
@@ -117,8 +131,10 @@ function status(a) {
|
||||
push(servers, {
|
||||
id, name: srv.name, ifname: srv.ifname, port: srv.port, subnet: srv.subnet,
|
||||
endpoint: core.endpoint_host(m, srv), public_key: srv.public_key, enabled: srv.enabled,
|
||||
lan_like: srv.lan_like, device_mesh: srv.device_mesh, preset: srv.preset, mtu: srv.mtu, keepalive: srv.keepalive, dns: srv.dns,
|
||||
lan_like: srv.lan_like, device_mesh: srv.device_mesh, mesh: srv.mesh, preset: srv.preset, mtu: srv.mtu, keepalive: srv.keepalive, dns: srv.dns,
|
||||
address: core.server_address(srv), up: !!st?.up, uptime: st?.uptime ?? 0,
|
||||
// Home networks (interfaces) for the per-person picker.
|
||||
home: map(net.server_net(srv).home, (h) => ({ dev: h.dev, nets: h.nets })),
|
||||
peers, online, obf: srv.obf,
|
||||
// Bytes per second, one point a minute: [ts, rx, tx] (rx = from devices).
|
||||
rate: rates[id] ?? [],
|
||||
@@ -169,9 +185,10 @@ function status(a) {
|
||||
servers,
|
||||
people,
|
||||
services: values(m.services),
|
||||
circles: values(m.circles),
|
||||
totals,
|
||||
series: live.series(recs, clamp_days(a.days)),
|
||||
events: slice(events, length(events) > 60 ? length(events) - 60 : 0),
|
||||
events: with_hosts(slice(events, length(events) > 60 ? length(events) - 60 : 0)),
|
||||
like_home: loop.status(),
|
||||
awg: core.awg_caps(),
|
||||
};
|
||||
@@ -406,9 +423,10 @@ function interfaces_view(srv, snap) {
|
||||
detected: { wan: snap.wan, lan: snap.lan },
|
||||
saved: { wan: srv.detected_wan, lan: srv.detected_lan },
|
||||
config: { auto_wan: srv.auto_wan, wan_device: srv.wan_device, auto_lan: srv.auto_lan, lan_devices: srv.lan_devices, lan_like: srv.lan_like,
|
||||
device_mesh: srv.device_mesh },
|
||||
device_mesh: srv.device_mesh, mesh: srv.mesh },
|
||||
like_home: loop.status(),
|
||||
needs: ops.needs().home,
|
||||
bonjour: { on: srv.bonjour, needs: ops.needs().bonjour, ...bonjour.view(core.load()) },
|
||||
effective: sn,
|
||||
zones: snap.zones,
|
||||
devices,
|
||||
@@ -455,8 +473,10 @@ function server_interfaces(a) {
|
||||
lans = uniq(lans);
|
||||
if (a.lan_like != null)
|
||||
c.set('dawnline', srv.id, 'lan_like', a.lan_like === false || a.lan_like === '0' ? '0' : '1');
|
||||
if (a.device_mesh != null)
|
||||
c.set('dawnline', srv.id, 'device_mesh', a.device_mesh === false || a.device_mesh === '0' ? '0' : '1');
|
||||
let mesh = index(core.MESH, a.mesh) >= 0 ? a.mesh
|
||||
: a.device_mesh == null ? srv.mesh : (a.device_mesh === false || a.device_mesh === '0' ? 'off' : 'all');
|
||||
c.set('dawnline', srv.id, 'mesh', mesh);
|
||||
c.delete('dawnline', srv.id, 'device_mesh');
|
||||
c.set('dawnline', srv.id, 'auto_wan', auto_wan ? '1' : '0');
|
||||
c.set('dawnline', srv.id, 'auto_lan', auto_lan ? '1' : '0');
|
||||
if (auto_wan || wan_dev == '')
|
||||
@@ -483,7 +503,6 @@ function server_interfaces(a) {
|
||||
system('chmod 600 /etc/config/dawnline');
|
||||
let before = join(',', net.server_net(srv, snap).nets);
|
||||
// What the admin changed here: the networks, and/or whether devices reach each other.
|
||||
let mesh = a.device_mesh == null ? srv.device_mesh : !(a.device_mesh === false || a.device_mesh === '0');
|
||||
let sig = (x) => {
|
||||
let sn = net.server_net(x, snap);
|
||||
return `${join(',', sn.nets)}|${sn.wan.dev}|${x.lan_like}`;
|
||||
@@ -491,8 +510,8 @@ function server_interfaces(a) {
|
||||
let what = [];
|
||||
if (sig(core.load(c).servers[srv.id]) != sig(srv))
|
||||
push(what, 'home network and internet path');
|
||||
if (mesh != srv.device_mesh)
|
||||
push(what, mesh ? 'devices reach each other' : 'devices kept apart');
|
||||
if (mesh != srv.mesh)
|
||||
push(what, { off: 'devices kept apart', all: 'devices reach each other', circles: 'devices reach each other in circles' }[mesh]);
|
||||
if (length(what))
|
||||
admin_log('awg', 'changed', 'server', srv.name, join(', ', what));
|
||||
apply.apply();
|
||||
@@ -532,8 +551,20 @@ function server_update(a) {
|
||||
}
|
||||
if (v.enabled != null)
|
||||
set('enabled', v.enabled === true || v.enabled == '1' ? '1' : '0');
|
||||
if (v.device_mesh != null)
|
||||
set('device_mesh', v.device_mesh === true || v.device_mesh == '1' ? '1' : '0');
|
||||
let bj = v.bonjour == null ? null : (v.bonjour === true || v.bonjour == '1');
|
||||
if (bj != null) {
|
||||
if (bj && length(ops.needs().bonjour))
|
||||
die('Install umdns first.');
|
||||
set('bonjour', bj ? '1' : null);
|
||||
}
|
||||
if (v.device_mesh != null && v.mesh == null)
|
||||
v.mesh = v.device_mesh === true || v.device_mesh == '1' ? 'all' : 'off';
|
||||
if (v.mesh != null) {
|
||||
if (index(core.MESH, v.mesh) < 0)
|
||||
die('Unknown choice for devices reaching each other.');
|
||||
set('mesh', v.mesh);
|
||||
set('device_mesh', null);
|
||||
}
|
||||
if (v.mtu != null) {
|
||||
if (str(v.mtu) != '' && (!match(str(v.mtu), /^[0-9]+$/) || +v.mtu < 1280 || +v.mtu > 1500))
|
||||
die('MTU must be 1280-1500.');
|
||||
@@ -566,15 +597,22 @@ function server_update(a) {
|
||||
push(what, label);
|
||||
}
|
||||
let on = v.enabled == null ? null : (v.enabled === true || v.enabled == '1');
|
||||
let mesh = v.device_mesh == null ? null : (v.device_mesh === true || v.device_mesh == '1');
|
||||
let mesh = v.mesh;
|
||||
let name = v.name != null ? str(v.name) : srv.name;
|
||||
let r = commit(c, true);
|
||||
if (on != null && on != srv.enabled)
|
||||
admin_log('awg', on ? 'turned on' : 'turned off', 'server', name);
|
||||
if (length(what))
|
||||
admin_log('awg', 'changed', 'server', name, join(', ', what));
|
||||
if (mesh != null && mesh != srv.device_mesh)
|
||||
admin_log('awg', 'changed', 'server', name, mesh ? 'devices reach each other' : 'devices kept apart');
|
||||
if (bj != null && bj != srv.bonjour) {
|
||||
admin_log('awg', bj ? 'turned on' : 'turned off', 'server', name, 'finding home devices (Bonjour)');
|
||||
if (bj)
|
||||
bonjour.start_mdns();
|
||||
bonjour.sync(core.load(), true);
|
||||
}
|
||||
if (mesh != null && mesh != srv.mesh)
|
||||
admin_log('awg', 'changed', 'server', name,
|
||||
{ off: 'devices kept apart', all: 'devices reach each other', circles: 'devices reach each other in circles' }[mesh]);
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -823,6 +861,10 @@ function person_update(a) {
|
||||
fields.paused = a.paused;
|
||||
if (type(a.services) == 'array')
|
||||
fields.services = a.services;
|
||||
if (a.circle != null)
|
||||
fields.circle = a.circle;
|
||||
if (type(a.home_nets) == 'array')
|
||||
fields.home_nets = a.home_nets;
|
||||
let before = m.people[a.id];
|
||||
core.update_person(c, m, a.id, fields);
|
||||
c.commit('dawnline');
|
||||
@@ -1038,6 +1080,99 @@ function service_set(a) {
|
||||
return { id };
|
||||
}
|
||||
|
||||
/** Create or edit a circle; `members` (person ids) replaces who is in it. */
|
||||
function circle_set(a) {
|
||||
let c = core.open_cursor();
|
||||
let m = core.load(c);
|
||||
let ci = a.id ? m.circles[a.id] : null;
|
||||
if (a.id && !ci)
|
||||
die('Unknown circle.');
|
||||
let server = ci?.server ?? a.server;
|
||||
if (!m.servers[server])
|
||||
die('Unknown server.');
|
||||
let name = trim(`${a.name ?? ''}`);
|
||||
if (name == '' || length(name) > 32)
|
||||
die('Enter a circle name (up to 32 characters).');
|
||||
for (let id, o in m.circles)
|
||||
if (id != a.id && o.server == server && lc(o.name) == lc(name))
|
||||
die(`${name} already exists.`);
|
||||
let id = ci?.id ?? `c_${rand_hex(4)}`;
|
||||
c.set('dawnline', id, 'circle');
|
||||
c.set('dawnline', id, 'server', server);
|
||||
c.set('dawnline', id, 'name', name);
|
||||
c.set('dawnline', id, 'color', `${(int(a.color) || 0) % core.CIRCLE_COLORS}`);
|
||||
if (type(a.members) == 'array') {
|
||||
let want = {};
|
||||
for (let pid in a.members)
|
||||
if (m.people[pid]?.server == server)
|
||||
want[pid] = true;
|
||||
for (let pid, p in m.people)
|
||||
if (want[pid])
|
||||
c.set('dawnline', pid, 'circle', id);
|
||||
else if (p.circle == id)
|
||||
c.delete('dawnline', pid, 'circle');
|
||||
}
|
||||
commit(c);
|
||||
admin_log('awg', ci ? 'changed' : 'added', 'circle', name, m.servers[server].name);
|
||||
return { id, circles: values(core.load().circles) };
|
||||
}
|
||||
|
||||
function circle_delete(a) {
|
||||
let c = core.open_cursor();
|
||||
let m = core.load(c);
|
||||
let ci = m.circles[a.id];
|
||||
if (!ci)
|
||||
die('Unknown circle.');
|
||||
c.delete('dawnline', a.id);
|
||||
for (let pid, p in m.people)
|
||||
if (p.circle == a.id)
|
||||
c.delete('dawnline', pid, 'circle');
|
||||
commit(c);
|
||||
admin_log('awg', 'removed', 'circle', ci.name, m.servers[ci.server]?.name);
|
||||
return { circles: values(core.load().circles) };
|
||||
}
|
||||
|
||||
/**
|
||||
* Devices at home for the Home services picker: DHCP leases and static hosts
|
||||
* in the server's home networks, with the services they announce (Bonjour,
|
||||
* when umdns runs).
|
||||
*/
|
||||
function home_hosts(a) {
|
||||
let m = core.load();
|
||||
let srv = m.servers[a.id] ?? values(m.servers)[0];
|
||||
if (!srv)
|
||||
die('No server yet.');
|
||||
let nets = net.server_net(srv).nets;
|
||||
let inside = (ip) => {
|
||||
let n = ip2int(ip);
|
||||
for (let cidr in nets) {
|
||||
let x = match(cidr, /^([0-9.]+)\/([0-9]+)$/);
|
||||
let size = 1 << (32 - +x[2]), base = ip2int(x[1]);
|
||||
if (n != null && n >= base && n < base + size)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
let hosts = {};
|
||||
for (let line in split(readfile('/tmp/dhcp.leases') ?? '', '\n')) {
|
||||
let f = split(line, ' ');
|
||||
if (length(f) >= 4 && inside(f[2]))
|
||||
hosts[f[2]] = { address: f[2], name: f[3] == '*' ? '' : f[3], mac: f[1], services: [] };
|
||||
}
|
||||
let c = cursor();
|
||||
c.foreach('dhcp', 'host', (h) => {
|
||||
if (h.ip && inside(h.ip))
|
||||
hosts[h.ip] ??= { address: h.ip, name: h.name ?? '', mac: type(h.mac) == 'array' ? h.mac[0] : h.mac ?? '', services: [] };
|
||||
});
|
||||
for (let s in ops.mdns_services())
|
||||
if (hosts[s.address])
|
||||
push(hosts[s.address].services, { type: s.type, name: s.name, port: s.port });
|
||||
else if (inside(s.address))
|
||||
hosts[s.address] = { address: s.address, name: s.host ?? '', mac: '', services: [ { type: s.type, name: s.name, port: s.port } ] };
|
||||
let out = values(hosts);
|
||||
return { hosts: sort(out, (x, y) => ip2int(x.address) - ip2int(y.address)), mdns: ops.mdns_running() };
|
||||
}
|
||||
|
||||
function service_delete(a) {
|
||||
let c = core.open_cursor();
|
||||
if (c.get('dawnline', a.id) != 'service')
|
||||
@@ -1060,7 +1195,7 @@ function events_list(a) {
|
||||
// Tunnel down/up events of older versions: the service log tells it better (names, reasons).
|
||||
let ev = filter(live.load_events(), (e) => e.type != 'server_down' && e.type != 'server_up');
|
||||
let n = +a.limit || 300;
|
||||
return { events: slice(ev, length(ev) > n ? length(ev) - n : 0), total: length(ev), policy: live.policy() };
|
||||
return { events: with_hosts(slice(ev, length(ev) > n ? length(ev) - n : 0)), total: length(ev), policy: live.policy() };
|
||||
}
|
||||
|
||||
/** Remove activity by person, device, category and/or age; nothing given clears it all. */
|
||||
@@ -1206,13 +1341,17 @@ const methods = {
|
||||
updates_run: { args: { what: '' }, call: wrap(updates_run) },
|
||||
person_update: {
|
||||
args: { id: '', name: '', access: '', device_limit: '', expires: '', expire_action: '', expire_warn: '', quota_gb: '',
|
||||
quota_period: '', bonus_gb: '', hours: '', note: '', dns_mode: '', paused: false, services: [] },
|
||||
quota_period: '', bonus_gb: '', hours: '', note: '', dns_mode: '', paused: false, services: [], circle: '', home_nets: [] },
|
||||
call: wrap(person_update),
|
||||
},
|
||||
settings_get: { call: wrap(settings_get) },
|
||||
settings_update: { args: { values: {} }, call: wrap(settings_update) },
|
||||
service_set: { args: { id: '', name: '', address: '', ports: [] }, call: wrap(service_set) },
|
||||
service_delete: { args: { id: '' }, call: wrap(service_delete) },
|
||||
circle_set: { args: { id: '', server: '', name: '', color: 0, members: [] }, call: wrap(circle_set) },
|
||||
circle_delete: { args: { id: '' }, call: wrap(circle_delete) },
|
||||
access_check: { args: { from: '', to: '' }, call: wrap((a) => access.check(core.load(), a.from, a.to)) },
|
||||
home_hosts: { args: { id: '' }, call: wrap(home_hosts) },
|
||||
geo_clear: { call: wrap((a) => { geo.clear(); return { ok: true }; }) },
|
||||
events: { args: { limit: 300 }, call: wrap(events_list) },
|
||||
logs_clear: { args: { person: '', device: '', category: '', older_days: '' }, call: wrap(logs_clear) },
|
||||
|
||||
@@ -0,0 +1,252 @@
|
||||
// Dawnline: "Check access" — walks the same rules the nft table and the
|
||||
// client configuration apply, and says in words where a connection stops.
|
||||
|
||||
'use strict';
|
||||
|
||||
import { ip2int } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as live from 'dawnline.live';
|
||||
import * as view from 'dawnline.view';
|
||||
|
||||
const STATE_TEXT = {
|
||||
no_server: 'their server is turned off',
|
||||
paused: 'they are paused',
|
||||
paused_all: 'everyone is paused',
|
||||
expired: 'their access has ended',
|
||||
quota: 'they used up their data',
|
||||
hours: 'it is outside their allowed hours',
|
||||
};
|
||||
|
||||
const ACCESS_TEXT = { lan: 'Home only', internet: 'Internet only', both: 'Home and Internet' };
|
||||
|
||||
function step(ok, title, detail) {
|
||||
return { ok: !!ok, title, detail: detail ?? '' };
|
||||
}
|
||||
|
||||
/** Add the step where it stops and end the walk. */
|
||||
function stop(steps, s) {
|
||||
push(steps, s);
|
||||
return steps;
|
||||
}
|
||||
|
||||
/** The first of `nets` (IPv4 CIDRs, any prefix) that holds `ip`. */
|
||||
function in_any(ip, nets) {
|
||||
let n = ip2int(ip);
|
||||
if (n == null)
|
||||
return null;
|
||||
for (let c in nets) {
|
||||
let mm = match(c, /^([0-9.]+)\/([0-9]+)$/);
|
||||
let base = mm ? ip2int(mm[1]) : null;
|
||||
if (base == null)
|
||||
continue;
|
||||
let size = 1 << (32 - +mm[2]);
|
||||
if (+mm[2] == 0 || (n >= base - base % size && n < base - base % size + size))
|
||||
return c;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** "10.0.1.20:445" → [ip, port]; a device id → its address. */
|
||||
function parse_target(m, s) {
|
||||
s = trim(`${s ?? ''}`);
|
||||
if (m.devices[s])
|
||||
return { dev: m.devices[s], ip: m.devices[s].address, port: null };
|
||||
let mm = match(s, /^([0-9.]+)(:([0-9]{1,5}))?$/);
|
||||
if (!mm || ip2int(mm[1]) == null)
|
||||
return null;
|
||||
let ip = mm[1];
|
||||
for (let id, d in m.devices)
|
||||
if (d.address == ip)
|
||||
return { dev: d, ip, port: mm[3] ? +mm[3] : null };
|
||||
return { ip, port: mm[3] ? +mm[3] : null };
|
||||
}
|
||||
|
||||
function home_access(p) {
|
||||
return p.access == 'both' || (p.access == 'lan' && !length(p.services));
|
||||
}
|
||||
|
||||
function peer_of(dmp, d) {
|
||||
return dmp.peers[d.public_key];
|
||||
}
|
||||
|
||||
/** The home network (interface) of a server that holds an address. */
|
||||
function home_dev_of(srv, ip, snap) {
|
||||
for (let h in net.server_net(srv, snap).home)
|
||||
if (in_any(ip, h.nets))
|
||||
return h.dev;
|
||||
return null;
|
||||
}
|
||||
|
||||
function router_addrs(snap) {
|
||||
let out = [];
|
||||
for (let dev, d in snap.devices)
|
||||
for (let a in d.addrs ?? [])
|
||||
push(out, split(a, '/')[0]);
|
||||
return out;
|
||||
}
|
||||
|
||||
function person_ok(m, p, d, states) {
|
||||
let st = states[p.id] ?? 'active';
|
||||
if (d.disabled)
|
||||
return step(false, `${d.name} is turned off`, 'Turn the device on again on its page.');
|
||||
if (st != 'active')
|
||||
return step(false, `${p.name} can't connect: ${STATE_TEXT[st] ?? st}`, '');
|
||||
return step(true, `${p.name} is active`, ACCESS_TEXT[p.access]);
|
||||
}
|
||||
|
||||
function connected(dmp, d, who) {
|
||||
let peer = peer_of(dmp, d);
|
||||
if (!peer || !(peer.handshake > 0))
|
||||
return step(false, `${who} has never connected`, 'There is no session the router could reach.');
|
||||
if (time() - peer.handshake >= live.ONLINE_WINDOW)
|
||||
return step(false, `${who} isn't connected right now`, 'The router reaches it only while its VPN is on.');
|
||||
return step(true, `${who} is connected`, '');
|
||||
}
|
||||
|
||||
/** A device → somewhere: the router, home, another device or the internet. */
|
||||
function from_device(m, d, t, states, dmp, snap) {
|
||||
let p = m.people[d.person];
|
||||
let srv = p ? m.servers[p.server] : null;
|
||||
if (!p || !srv)
|
||||
return [ step(false, `${d.name} has no server`, '') ];
|
||||
let steps = [ person_ok(m, p, d, states) ];
|
||||
if (!steps[0].ok)
|
||||
return steps;
|
||||
let allowed = core.allowed_ips(m, srv, p);
|
||||
let via = (ip) => {
|
||||
let hit = in_any(ip, allowed);
|
||||
return hit
|
||||
? step(true, 'Its configuration sends it through the tunnel', `AllowedIPs ${join(', ', filter(allowed, (x) => index(x, ':') < 0))}`)
|
||||
: step(false, "Its configuration doesn't send it through the tunnel", `AllowedIPs ${join(', ', allowed)}: the device's own network handles it.`);
|
||||
};
|
||||
|
||||
// Another device.
|
||||
if (t.dev) {
|
||||
let q = m.people[t.dev.person];
|
||||
let who = `${q?.name ?? '?'} · ${t.dev.name}`;
|
||||
if (t.dev.id == d.id)
|
||||
return [ step(false, 'That is the same device', '') ];
|
||||
if (!q || q.server != p.server)
|
||||
return stop(steps, step(false, `${who} is on another server`, 'Devices of different servers never reach each other.'));
|
||||
if (!home_access(p))
|
||||
return stop(steps, step(false, `${p.name} has ${ACCESS_TEXT[p.access]}`, 'Only people with home access reach other devices.'));
|
||||
if (!home_access(q))
|
||||
return stop(steps, step(false, `${q.name} has ${ACCESS_TEXT[q.access]}`, 'Only devices of people with home access can be reached.'));
|
||||
if (srv.mesh == 'off')
|
||||
return stop(steps, step(false, `"Devices reach each other" is off on ${srv.name}`, 'Server → Access → Home network.'));
|
||||
if (srv.mesh == 'circles' && q.id != p.id) {
|
||||
let a = core.person_circle(m, p), b = core.person_circle(m, q);
|
||||
if (!a || !b || a.id != b.id)
|
||||
return stop(steps, step(false, `${p.name} and ${q.name} are not in one circle`,
|
||||
`${p.name}: ${a?.name ?? 'no circle'} · ${q.name}: ${b?.name ?? 'no circle'}`));
|
||||
push(steps, step(true, `Both are in ${a.name}`, 'Devices in one circle reach each other.'));
|
||||
}
|
||||
else
|
||||
push(steps, step(true, q.id == p.id ? `Both are ${p.name}'s devices` : 'Devices reach each other on this server', ''));
|
||||
let st = states[q.id] ?? 'active';
|
||||
if (st != 'active' || t.dev.disabled)
|
||||
return stop(steps, step(false, `${who} can't be reached: ${t.dev.disabled ? 'it is turned off' : STATE_TEXT[st] ?? st}`, ''));
|
||||
push(steps, via(t.ip));
|
||||
push(steps, connected(dmp, t.dev, who));
|
||||
return steps;
|
||||
}
|
||||
|
||||
// The router itself.
|
||||
if (index(router_addrs(snap), t.ip) >= 0) {
|
||||
if (home_access(p))
|
||||
push(steps, step(true, `${t.ip} is this router`, 'Home access includes the router.'));
|
||||
else if (t.port == 53)
|
||||
push(steps, step(true, `${t.ip} is this router: DNS is open to everyone`, ''));
|
||||
else
|
||||
return stop(steps, step(false, `${t.ip} is this router`, `${p.name} has ${ACCESS_TEXT[p.access]}: only DNS on the router.`));
|
||||
push(steps, via(t.ip));
|
||||
return steps;
|
||||
}
|
||||
|
||||
// Home.
|
||||
let sn = net.server_net(srv, snap);
|
||||
let hdev = home_dev_of(srv, t.ip, snap);
|
||||
if (hdev) {
|
||||
if (p.access == 'internet')
|
||||
return stop(steps, step(false, `${t.ip} is at home (${hdev})`, `${p.name} has Internet only.`));
|
||||
if (p.access == 'lan' && length(p.services)) {
|
||||
let hit = null;
|
||||
for (let sid in p.services) {
|
||||
let s = m.services[sid];
|
||||
if (s?.address == t.ip && (!length(s.ports) || t.port == null || index(s.ports, `${t.port}`) >= 0))
|
||||
hit = s;
|
||||
}
|
||||
let names = join(', ', map(filter(map(p.services, (x) => m.services[x]), (x) => x), (x) => x.name));
|
||||
if (!hit)
|
||||
return stop(steps, step(false, `${t.ip}${t.port ? `:${t.port}` : ''} is not one of ${p.name}'s home services`, `Allowed: ${names}`));
|
||||
push(steps, step(true, `${t.ip} is ${hit.name}, one of ${p.name}'s home services`,
|
||||
length(hit.ports) ? `Ports ${join(', ', hit.ports)}` : 'All ports'));
|
||||
}
|
||||
else {
|
||||
let h = core.person_home(srv, p, snap);
|
||||
if (!in_any(t.ip, h.nets))
|
||||
return stop(steps, step(false, `${t.ip} is in ${hdev}, which ${p.name} doesn't reach`, `${p.name} reaches ${join(', ', h.devs) || 'no home network'}.`));
|
||||
push(steps, step(true, `${t.ip} is in ${hdev}`, h.all ? 'Home access reaches every home network.' : `One of the networks ${p.name} reaches.`));
|
||||
}
|
||||
push(steps, via(t.ip));
|
||||
push(steps, step(true, 'The firewall lets it through', `${srv.ifname} → ${join(', ', sn.zones) || 'home'}`));
|
||||
return steps;
|
||||
}
|
||||
|
||||
// Another private address, or the internet.
|
||||
if (in_any(t.ip, [ '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', '100.64.0.0/10', '169.254.0.0/16' ]))
|
||||
return stop(steps, step(false, `${t.ip} isn't in ${srv.name}'s home network`, 'Private addresses outside the home network are blocked.'));
|
||||
if (p.access == 'lan')
|
||||
return stop(steps, step(true, `${t.ip} is on the internet`, `${p.name} has Home only: their device's own internet reaches it, not the tunnel.`));
|
||||
push(steps, via(t.ip));
|
||||
push(steps, step(true, `${t.ip} is on the internet`, srv.lan_like ? 'It leaves like a home device would.' : `It leaves through ${sn.wan.dev ?? 'the WAN'}.`));
|
||||
return steps;
|
||||
}
|
||||
|
||||
/** A home address → a device. */
|
||||
function to_device(m, ip, d, states, dmp, snap) {
|
||||
let p = m.people[d.person];
|
||||
let srv = p ? m.servers[p.server] : null;
|
||||
if (!p || !srv)
|
||||
return [ step(false, `${d.name} has no server`, '') ];
|
||||
let who = `${p.name} · ${d.name}`;
|
||||
let hdev = home_dev_of(srv, ip, snap);
|
||||
if (!hdev)
|
||||
return [ step(false, `${ip} isn't in ${srv.name}'s home network`, 'Only home devices reach people\'s devices.') ];
|
||||
let steps = [ step(true, `${ip} is at home (${hdev})`, '') ];
|
||||
if (!home_access(p))
|
||||
return stop(steps, step(false, `${p.name} has ${p.access == 'lan' ? 'only some home services' : ACCESS_TEXT[p.access]}`,
|
||||
'Home devices reach only people with home access.'));
|
||||
let h = core.person_home(srv, p, snap);
|
||||
if (!in_any(ip, h.nets))
|
||||
return stop(steps, step(false, `${p.name} doesn't reach ${hdev}`, 'Networks a person does not reach cannot reach them either.'));
|
||||
push(steps, person_ok(m, p, d, states));
|
||||
if (!steps[length(steps) - 1].ok)
|
||||
return steps;
|
||||
push(steps, step(true, 'The firewall lets it through', `${join(', ', net.server_net(srv, snap).zones) || 'home'} → ${srv.ifname}`));
|
||||
push(steps, connected(dmp, d, who));
|
||||
return steps;
|
||||
}
|
||||
|
||||
/** `from` and `to`: a device id, or an IPv4 address (optionally :port). */
|
||||
export function check(m, from, to) {
|
||||
let a = parse_target(m, from), b = parse_target(m, to);
|
||||
if (!a)
|
||||
die(`"${from}" is not a device or an IPv4 address.`);
|
||||
if (!b)
|
||||
die(`"${to}" is not a device or an IPv4 address.`);
|
||||
let usage = core.load_usage();
|
||||
let states = view.states(m, usage);
|
||||
let dmp = live.dump();
|
||||
let snap = net.snapshot(true);
|
||||
let steps;
|
||||
if (a.dev)
|
||||
steps = from_device(m, a.dev, b, states, dmp, snap);
|
||||
else if (b.dev)
|
||||
steps = to_device(m, a.ip, b.dev, states, dmp, snap);
|
||||
else
|
||||
die('Choose a device on at least one side.');
|
||||
let ok = length(filter(steps, (s) => !s.ok)) == 0;
|
||||
return { ok, steps };
|
||||
};
|
||||
@@ -269,7 +269,12 @@ const PRIVATE4 = [ '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', '100.64.0.0/
|
||||
|
||||
/** Per-person runtime membership: which tunnel addresses may reach what. */
|
||||
export function access_sets(m, usage, states) {
|
||||
let sets = { lan_ok: [], inet_ok: [], svc_ok: [], dns_real: [] };
|
||||
// lan_ok: home access (the router itself, the mesh); lan_all: every home
|
||||
// network; lan_part: device . network for people limited to some networks;
|
||||
// mesh_pairs: device . device within a circle (or one person's own devices).
|
||||
let sets = { lan_ok: [], lan_all: [], lan_part: [], mesh_pairs: [], inet_ok: [], svc_ok: [], dns_real: [] };
|
||||
let snap = net.snapshot();
|
||||
let homes = {}, groups = {};
|
||||
for (let id, d in m.devices) {
|
||||
let p = m.people[d.person];
|
||||
if (!p || d.disabled || !d.address || states[p.id] != 'active')
|
||||
@@ -280,8 +285,21 @@ export function access_sets(m, usage, states) {
|
||||
push(sets.dns_real, d.address);
|
||||
if (p.access == 'internet' || p.access == 'both')
|
||||
push(sets.inet_ok, d.address);
|
||||
if (p.access == 'both' || (p.access == 'lan' && !length(p.services)))
|
||||
if (p.access == 'both' || (p.access == 'lan' && !length(p.services))) {
|
||||
push(sets.lan_ok, d.address);
|
||||
let srv = m.servers[p.server];
|
||||
let h = homes[p.id] ??= srv ? core.person_home(srv, p, snap) : { all: true, nets: [] };
|
||||
if (h.all)
|
||||
push(sets.lan_all, d.address);
|
||||
else
|
||||
for (let n in h.nets)
|
||||
push(sets.lan_part, `${d.address} . ${n}`);
|
||||
// Who this device may reach directly: its circle, or at least its owner's devices.
|
||||
if (srv?.mesh == 'circles') {
|
||||
let ci = core.person_circle(m, p);
|
||||
push(groups[ci ? `c:${ci.id}` : `p:${p.id}`] ??= [], d.address);
|
||||
}
|
||||
}
|
||||
else if (p.access == 'lan')
|
||||
for (let sid in p.services) {
|
||||
let s = m.services[sid];
|
||||
@@ -292,6 +310,11 @@ export function access_sets(m, usage, states) {
|
||||
push(sets.svc_ok, `${d.address} . ${s.address} . ${port}`);
|
||||
}
|
||||
}
|
||||
for (let g, addrs in groups)
|
||||
for (let a in addrs)
|
||||
for (let b in addrs)
|
||||
if (a != b)
|
||||
push(sets.mesh_pairs, `${a} . ${b}`);
|
||||
return sets;
|
||||
};
|
||||
|
||||
@@ -314,6 +337,9 @@ function nft_table(m, sets) {
|
||||
push(t, 'table inet dawnline {');
|
||||
push(t, ` set lan_nets { type ipv4_addr; flags interval; auto-merge; ${set_elems(lan)} }`);
|
||||
push(t, ` set lan_ok { type ipv4_addr; ${set_elems(sets.lan_ok)} }`);
|
||||
push(t, ` set lan_all { type ipv4_addr; ${set_elems(sets.lan_all)} }`);
|
||||
push(t, ` set lan_part { type ipv4_addr . ipv4_addr; flags interval; ${set_elems(sets.lan_part)} }`);
|
||||
push(t, ` set mesh_pairs { type ipv4_addr . ipv4_addr; ${set_elems(sets.mesh_pairs)} }`);
|
||||
push(t, ` set inet_ok { type ipv4_addr; ${set_elems(sets.inet_ok)} }`);
|
||||
push(t, ` set svc_ok { type ipv4_addr . ipv4_addr . inet_service; ${set_elems(sets.svc_ok)} }`);
|
||||
push(t, ` set dns_real { type ipv4_addr; ${set_elems(sets.dns_real)} }`);
|
||||
@@ -333,13 +359,16 @@ function nft_table(m, sets) {
|
||||
if (dns_addr)
|
||||
// DNS through the netns (it forwards to the LAN's DNS), for everyone.
|
||||
push(t, ` ip daddr ${dns_addr} meta l4proto { tcp, udp } th dport 53 accept`);
|
||||
push(t, ' ip daddr @lan_nets ip saddr @lan_ok accept');
|
||||
push(t, ' ip daddr @lan_nets ip saddr @lan_all accept');
|
||||
push(t, ' ip saddr . ip daddr @lan_part accept');
|
||||
// Devices with home access are part of home: they reach each other, where the
|
||||
// server allows it. Within one server: the firewall has no forwarding between
|
||||
// different servers' zones.
|
||||
// server allows it (everyone, or within circles). Within one server: the
|
||||
// firewall has no forwarding between different servers' zones.
|
||||
for (let id, srv in m.servers)
|
||||
if (srv.private_key && srv.device_mesh)
|
||||
if (srv.private_key && srv.mesh == 'all')
|
||||
push(t, ` iifname "${srv.ifname}" ip saddr @lan_ok ip daddr @lan_ok accept`);
|
||||
else if (srv.private_key && srv.mesh == 'circles')
|
||||
push(t, ` iifname "${srv.ifname}" ip saddr . ip daddr @mesh_pairs accept`);
|
||||
push(t, ' meta l4proto { tcp, udp } ip saddr . ip daddr . th dport @svc_ok accept');
|
||||
push(t, ` ip daddr { ${join(', ', PRIVATE4)} } counter drop`);
|
||||
push(t, ' ip saddr @inet_ok accept');
|
||||
@@ -357,7 +386,8 @@ function nft_table(m, sets) {
|
||||
push(t, ' chain to_device {');
|
||||
push(t, ' meta nfproto ipv6 drop');
|
||||
push(t, ' ct status dnat accept');
|
||||
push(t, ' ip saddr @lan_nets ip daddr @lan_ok accept');
|
||||
push(t, ' ip saddr @lan_nets ip daddr @lan_all accept');
|
||||
push(t, ' ip daddr . ip saddr @lan_part accept');
|
||||
push(t, ' counter reject with icmpx admin-prohibited');
|
||||
push(t, ' }');
|
||||
// Devices ask the tunnel address; send each query where it belongs.
|
||||
@@ -400,7 +430,7 @@ export function rebuild_nft(m, sets) {
|
||||
/** Atomically replace set contents only. */
|
||||
export function update_sets(sets) {
|
||||
let s = '';
|
||||
for (let name in [ 'lan_ok', 'inet_ok', 'svc_ok', 'dns_real' ]) {
|
||||
for (let name in [ 'lan_ok', 'lan_all', 'lan_part', 'mesh_pairs', 'inet_ok', 'svc_ok', 'dns_real' ]) {
|
||||
s += `flush set inet dawnline ${name}\n`;
|
||||
if (length(sets[name]))
|
||||
s += `add element inet dawnline ${name} { ${join(', ', sets[name])} }\n`;
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
// Dawnline: "Find home devices" (Bonjour over the tunnel). Multicast DNS does
|
||||
// not cross WireGuard, so what umdns sees on the home networks is published
|
||||
// as unicast DNS-SD records in dnsmasq: iPhone, iPad and Mac look there
|
||||
// (browse domains under the home domain and the reverse zone of their own
|
||||
// tunnel address) and list AirPlay, printers and shared Macs as at home.
|
||||
|
||||
'use strict';
|
||||
|
||||
import { readfile, writefile, unlink, lsdir, stat } from 'fs';
|
||||
import { read_json, write_json, ensure_dir, RUN_DIR } from 'dawnline.util';
|
||||
import * as ops from 'dawnline.ops';
|
||||
|
||||
const FILE = 'dawnline-bonjour.conf';
|
||||
const STATE = `${RUN_DIR}/bonjour.json`;
|
||||
/** dnsmasq restarts to read the records: at most this often when only TXT data changed. */
|
||||
const QUIET = 600;
|
||||
/** Not useful from a phone, or not a service at all. */
|
||||
const SKIP = [ '_device-info._tcp', '_companion-link._tcp', '_sleep-proxy._udp', '_workstation._tcp', '_rdlink._tcp', '_hap._udp' ];
|
||||
|
||||
export function enabled(m) {
|
||||
for (let id, srv in m.servers)
|
||||
if (srv.bonjour && srv.private_key)
|
||||
return true;
|
||||
return false;
|
||||
};
|
||||
|
||||
/** dnsmasq's conf-dirs (one per instance), from its generated configs. */
|
||||
function conf_dirs() {
|
||||
let out = [];
|
||||
for (let f in lsdir('/var/etc') ?? []) {
|
||||
if (!match(f, /^dnsmasq\.conf\./))
|
||||
continue;
|
||||
for (let line in split(readfile(`/var/etc/${f}`) ?? '', '\n')) {
|
||||
let mm = match(line, /^conf-dir=([^,]+)/);
|
||||
if (mm && index(out, mm[1]) < 0)
|
||||
push(out, mm[1]);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** An instance name as dnsmasq takes it: printable ASCII, no dots or commas. */
|
||||
function instance(s) {
|
||||
s = replace(s ?? '', /[\u2018\u2019]/g, "'");
|
||||
s = replace(s, /[\u201c\u201d]/g, '');
|
||||
s = replace(s, /[^\x20-\x7e]/g, '');
|
||||
s = replace(s, /[.,"\\]/g, ' ');
|
||||
s = trim(replace(s, / +/g, ' '));
|
||||
return substr(s, 0, 63);
|
||||
}
|
||||
|
||||
function label(s) {
|
||||
return substr(trim(replace(replace(s ?? '', /[^A-Za-z0-9-]+/g, '-'), /^-+|-+$/g, '')), 0, 63);
|
||||
}
|
||||
|
||||
/** Reverse zone of a server's tunnel network (its /24), where devices look for browse domains. */
|
||||
function reverse24(subnet) {
|
||||
let mm = match(subnet ?? '', /^([0-9]+)\.([0-9]+)\.([0-9]+)\.[0-9]+\//);
|
||||
return mm ? `0.${mm[3]}.${mm[2]}.${mm[1]}.in-addr.arpa` : null;
|
||||
}
|
||||
|
||||
/** The records, and a signature of what matters without TXT data. */
|
||||
export function records(m, services) {
|
||||
let dom = m.settings.domain || 'lan';
|
||||
let lines = [], sig = [];
|
||||
let zones = [ dom ];
|
||||
for (let id, srv in m.servers)
|
||||
if (srv.bonjour && reverse24(srv.subnet))
|
||||
push(zones, reverse24(srv.subnet));
|
||||
for (let z in zones)
|
||||
for (let b in [ 'b', 'db', 'lb' ])
|
||||
push(lines, `ptr-record=${b}._dns-sd._udp.${z},${dom}`);
|
||||
let types = {}, hosts = {};
|
||||
for (let s in services) {
|
||||
if (!s.port || index(SKIP, s.type) >= 0 || !match(s.type, /^_[A-Za-z0-9-]+\._(tcp|udp)$/))
|
||||
continue;
|
||||
let name = instance(s.name), host = label(s.host) || label(replace(s.address, /\./g, '-'));
|
||||
if (name == '')
|
||||
continue;
|
||||
let full = `${name}.${s.type}.${dom}`;
|
||||
types[s.type] = true;
|
||||
hosts[host] = s.address;
|
||||
push(lines, `ptr-record=${s.type}.${dom},${full}`);
|
||||
push(lines, `srv-host=${full},${host}.${dom},${s.port}`);
|
||||
let txt = filter(s.txt ?? [], (t) => type(t) == 'string' && length(t) <= 255 && !match(t, /["\\\n]/));
|
||||
push(lines, length(txt) ? `txt-record=${full},${join(',', map(txt, (t) => `"${t}"`))}` : `txt-record=${full}`);
|
||||
push(sig, `${full}|${host}|${s.port}`);
|
||||
}
|
||||
for (let t in sort(keys(types)))
|
||||
push(lines, `ptr-record=_services._dns-sd._udp.${dom},${t}.${dom}`);
|
||||
for (let h in sort(keys(hosts))) {
|
||||
push(lines, `host-record=${h}.${dom},${hosts[h]}`);
|
||||
push(sig, `${h}=${hosts[h]}`);
|
||||
}
|
||||
return { conf: '# Written by Dawnline: home devices for Bonjour over the tunnel.\n' + join('\n', lines) + '\n', sig: join('\n', sort(sig)) };
|
||||
};
|
||||
|
||||
function restart_dnsmasq() {
|
||||
system('/etc/init.d/dnsmasq restart >/dev/null 2>&1');
|
||||
}
|
||||
|
||||
/**
|
||||
* Keep the records in step with what umdns sees (agent tick and apply).
|
||||
* Turned off: the records go away.
|
||||
*/
|
||||
export function sync(m, force) {
|
||||
let dirs = conf_dirs();
|
||||
if (!enabled(m) || !ops.mdns_running()) {
|
||||
let removed = false;
|
||||
for (let d in dirs)
|
||||
if (stat(`${d}/${FILE}`)) {
|
||||
unlink(`${d}/${FILE}`);
|
||||
removed = true;
|
||||
}
|
||||
if (removed)
|
||||
restart_dnsmasq();
|
||||
unlink(STATE);
|
||||
return false;
|
||||
}
|
||||
let r = records(m, ops.mdns_services());
|
||||
let st = read_json(STATE, {});
|
||||
let now = time();
|
||||
let same = st.conf == r.conf;
|
||||
let quiet = !force && st.sig == r.sig && now - (st.ts ?? 0) < QUIET;
|
||||
let missing = length(filter(dirs, (d) => !stat(`${d}/${FILE}`)));
|
||||
if ((same || quiet) && !missing)
|
||||
return false;
|
||||
for (let d in dirs) {
|
||||
ensure_dir(d);
|
||||
writefile(`${d}/${FILE}`, r.conf);
|
||||
system(`chmod 644 ${d}/${FILE}`);
|
||||
}
|
||||
write_json(STATE, { conf: r.conf, sig: r.sig, ts: now }, 0o644);
|
||||
restart_dnsmasq();
|
||||
return true;
|
||||
};
|
||||
|
||||
/** Turning it on: umdns must run and look at the home networks. */
|
||||
export function start_mdns() {
|
||||
system('/etc/init.d/umdns enable >/dev/null 2>&1; /etc/init.d/umdns start >/dev/null 2>&1');
|
||||
};
|
||||
|
||||
export function view(m) {
|
||||
let s = ops.mdns_running() ? ops.mdns_services() : [];
|
||||
return {
|
||||
running: ops.mdns_running(),
|
||||
services: length(filter(s, (x) => x.port && index(SKIP, x.type) < 0)),
|
||||
};
|
||||
};
|
||||
@@ -14,6 +14,10 @@ import * as loop from 'dawnline.loop';
|
||||
export const CONFIG = 'dawnline';
|
||||
export const ACCESS = [ 'lan', 'internet', 'both' ];
|
||||
export const KINDS = [ 'computer', 'phone', 'tablet', 'router', 'other' ];
|
||||
/** Devices of different people reaching each other: never, everyone with home access, or within a circle. */
|
||||
export const MESH = [ 'off', 'all', 'circles' ];
|
||||
/** Circle colours (index into the admin palette). */
|
||||
export const CIRCLE_COLORS = 8;
|
||||
export const OBF_KEYS = [ 'jc', 'jmin', 'jmax', 's1', 's2', 's3', 's4', 'h1', 'h2', 'h3', 'h4', 'i1', 'i2', 'i3', 'i4', 'i5',
|
||||
// AmneziaWG 3.x
|
||||
'header_protection_key', 'content_padding_addition', 'rekey_after_time', 'rekey_timeout', 'reject_after_time',
|
||||
@@ -102,6 +106,7 @@ export function load(c) {
|
||||
people: {},
|
||||
devices: {},
|
||||
services: {},
|
||||
circles: {},
|
||||
};
|
||||
|
||||
c.foreach(CONFIG, 'server', (r) => {
|
||||
@@ -128,11 +133,16 @@ export function load(c) {
|
||||
detected_wan: r.detected_wan ?? '',
|
||||
detected_lan: r.detected_lan ?? '',
|
||||
lan_like: bool(r.lan_like, true),
|
||||
// Devices of people with home access reach each other through the tunnel.
|
||||
device_mesh: bool(r.device_mesh, true),
|
||||
// Devices of people with home access reach each other: off, all, or within circles.
|
||||
// (Older configs: device_mesh 0/1.)
|
||||
mesh: index(MESH, r.mesh) >= 0 ? r.mesh : (bool(r.device_mesh, true) ? 'all' : 'off'),
|
||||
enabled: bool(r.enabled, true),
|
||||
// Home devices found over Bonjour are published as DNS-SD records (needs umdns).
|
||||
bonjour: bool(r.bonjour, false),
|
||||
obf: {},
|
||||
};
|
||||
// A person's own devices reach each other whenever the mesh is not off.
|
||||
srv.device_mesh = srv.mesh != 'off';
|
||||
for (let k in OBF_KEYS)
|
||||
if (r[k] != null && r[k] != '')
|
||||
srv.obf[k] = `${r[k]}`;
|
||||
@@ -160,6 +170,9 @@ export function load(c) {
|
||||
bonus_gb: num(r.bonus_gb, 0),
|
||||
bonus_month: r.bonus_month ?? '',
|
||||
services: list(r.service),
|
||||
// Home networks (interfaces) this person reaches; empty = all of the server's.
|
||||
home_nets: list(r.home_net),
|
||||
circle: r.circle ?? '',
|
||||
note: r.note ?? '',
|
||||
created: toint(r.created, 0),
|
||||
devices: [],
|
||||
@@ -186,6 +199,11 @@ export function load(c) {
|
||||
push(m.people[d.person].devices, id);
|
||||
});
|
||||
|
||||
c.foreach(CONFIG, 'circle', (r) => {
|
||||
let id = r['.name'];
|
||||
m.circles[id] = { id, server: r.server ?? '', name: r.name ?? id, color: toint(r.color, 0) % CIRCLE_COLORS };
|
||||
});
|
||||
|
||||
c.foreach(CONFIG, 'service', (r) => {
|
||||
let id = r['.name'];
|
||||
m.services[id] = {
|
||||
@@ -460,9 +478,33 @@ export function client_dns(m, srv, p) {
|
||||
return out;
|
||||
};
|
||||
|
||||
/**
|
||||
* The home networks a person reaches: all of the server's, or only the
|
||||
* interfaces ticked on their page (networks added later are not included).
|
||||
*/
|
||||
export function person_home(srv, p, snap) {
|
||||
let sn = net.server_net(srv, snap);
|
||||
let pick = p?.home_nets ?? [];
|
||||
if (!length(pick))
|
||||
return { all: true, nets: sn.nets, devs: map(sn.home, (h) => h.dev) };
|
||||
let nets = [], devs = [];
|
||||
for (let h in sn.home)
|
||||
if (index(pick, h.dev) >= 0) {
|
||||
push(nets, ...h.nets);
|
||||
push(devs, h.dev);
|
||||
}
|
||||
return { all: false, nets: net.collapse(nets), devs };
|
||||
};
|
||||
|
||||
/** The circle a person is in on their server (circles mode only), or null. */
|
||||
export function person_circle(m, p) {
|
||||
let c = m.circles[p?.circle];
|
||||
return c && c.server == p.server ? c : null;
|
||||
};
|
||||
|
||||
export function allowed_ips(m, srv, p) {
|
||||
if (p.access == 'lan') {
|
||||
let nets = net.server_net(srv).nets;
|
||||
let nets = person_home(srv, p).nets;
|
||||
// With devices reaching each other, the whole tunnel network (the router's
|
||||
// address is in it); otherwise only the router's own address.
|
||||
let a = server_address(srv);
|
||||
@@ -750,6 +792,19 @@ export function update_person(c, m, id, a) {
|
||||
else
|
||||
c.delete(CONFIG, id, 'service');
|
||||
}
|
||||
if (a.circle != null) {
|
||||
let ci = m.circles[a.circle];
|
||||
if (a.circle != '' && (!ci || ci.server != p.server))
|
||||
fail('Unknown circle.');
|
||||
set('circle', a.circle);
|
||||
}
|
||||
if (type(a.home_nets) == 'array') {
|
||||
let nets = uniq(filter(map(a.home_nets, (x) => trim(`${x}`)), (x) => match(x, /^[A-Za-z0-9_.@-]{1,32}$/)));
|
||||
if (length(nets))
|
||||
c.set(CONFIG, id, 'home_net', nets);
|
||||
else
|
||||
c.delete(CONFIG, id, 'home_net');
|
||||
}
|
||||
if (a.paused != null)
|
||||
set('paused', a.paused ? '1' : '');
|
||||
};
|
||||
|
||||
@@ -266,3 +266,28 @@ export function wan_address(srv, snap) {
|
||||
let a = snap.devices[server_net(srv, snap).wan.dev]?.addrs?.[0];
|
||||
return a ? split(a, '/')[0] : null;
|
||||
};
|
||||
|
||||
/** Names of devices at home by address: DHCP leases, then static hosts. */
|
||||
export function lan_names() {
|
||||
let out = {};
|
||||
for (let line in split(readfile('/tmp/dhcp.leases') ?? '', '\n')) {
|
||||
let f = split(line, ' ');
|
||||
if (length(f) >= 4 && f[3] != '*')
|
||||
out[f[2]] = f[3];
|
||||
}
|
||||
let c = cursor();
|
||||
c.foreach('dhcp', 'host', (h) => {
|
||||
if (h.ip && h.name)
|
||||
out[h.ip] ??= h.name;
|
||||
});
|
||||
return out;
|
||||
};
|
||||
|
||||
/** Event addresses that belong to devices at home, with their names ({ ip: name }). */
|
||||
export function event_hosts(e, names) {
|
||||
let out = null;
|
||||
for (let ip in match(e.detail ?? '', /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/g) ?? [])
|
||||
if (names[ip[0]])
|
||||
(out ??= {})[ip[0]] = names[ip[0]];
|
||||
return out;
|
||||
};
|
||||
@@ -34,9 +34,39 @@ export function needs() {
|
||||
acme: miss([ [ file_exists('/usr/lib/acme/client/acme.sh'), 'acme' ], [ file_exists('/usr/lib/acme/client/dnsapi/dns_cf.sh'), 'acme-acmesh-dnsapi' ],
|
||||
[ file_exists('/www/luci-static/resources/view/acme.js'), 'luci-app-acme' ] ]),
|
||||
home: miss([ [ file_exists('/usr/libexec/ip-full'), 'ip-full' ], [ veth, 'kmod-veth' ] ]),
|
||||
bonjour: miss([ [ file_exists('/usr/sbin/umdns'), 'umdns' ] ]),
|
||||
};
|
||||
};
|
||||
|
||||
/** True while OpenWrt's mDNS daemon answers on ubus. */
|
||||
export function mdns_running() {
|
||||
return index(split(sh_out('ubus list umdns 2>/dev/null') ?? '', '\n'), 'umdns') >= 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* Services announced on the home networks (Bonjour), from umdns:
|
||||
* [{ type: '_airplay._tcp', name, host, address, port, txt }].
|
||||
*/
|
||||
export function mdns_services() {
|
||||
if (!mdns_running())
|
||||
return [];
|
||||
let r = {};
|
||||
try {
|
||||
r = json(sh_out(`ubus call umdns browse '{"address":true}' 2>/dev/null`) || '{}') ?? {};
|
||||
}
|
||||
catch (e) {
|
||||
r = {};
|
||||
}
|
||||
let out = [];
|
||||
for (let t, insts in r)
|
||||
for (let name, i in insts) {
|
||||
let addr = type(i.ipv4) == 'array' ? i.ipv4[0] : i.ipv4;
|
||||
if (addr)
|
||||
push(out, { type: t, name, host: replace(i.host ?? '', /\.local\.?$/, ''), address: addr, port: i.port ?? 0, txt: i.txt ?? [] });
|
||||
}
|
||||
return out;
|
||||
};
|
||||
|
||||
/** ACME certificates on the router and the names each covers. */
|
||||
function acme_certs() {
|
||||
let out = [];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
|
||||
|
||||
export const VERSION = '0.2.0';
|
||||
export const VERSION = '0.3.0';
|
||||
/** GitHub repository with Dawnline releases (updates and the installer). */
|
||||
export const REPO = 'tickcount/luci-app-dawnline';
|
||||
export const RUN_DIR = '/var/run/dawnline';
|
||||
|
||||
@@ -90,6 +90,8 @@ export function person_view(m, p, usage, dmp, states, opts) {
|
||||
v.links = core.portal_urls(m, p);
|
||||
v.note = p.note;
|
||||
v.services = p.services;
|
||||
v.home_nets = p.home_nets;
|
||||
v.circle = p.circle;
|
||||
v.created = p.created;
|
||||
}
|
||||
return v;
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "dawnline-web",
|
||||
"version": "0.2.0",
|
||||
"version": "0.3.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dawnline-web",
|
||||
"version": "0.2.0",
|
||||
"version": "0.3.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"qrcode-generator": "1.4.4"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dawnline-web",
|
||||
"version": "0.2.0",
|
||||
"version": "0.3.0",
|
||||
"private": true,
|
||||
"license": "MIT",
|
||||
"type": "module",
|
||||
|
||||
@@ -0,0 +1,441 @@
|
||||
// Server → Access pieces: home services (picked from devices at home), circles,
|
||||
// "Who reaches what" and "Check access".
|
||||
|
||||
import type { Circle, Person, Server, Status } from '../shared/types';
|
||||
import { E } from './e';
|
||||
import { api, type HomeHost } from './api';
|
||||
import { attempt, button, closeModal, confirmDialog, modal } from './ui';
|
||||
import { input } from './kit';
|
||||
import { icon } from '../shared/icons';
|
||||
|
||||
type Service = Status['services'][number];
|
||||
|
||||
/** Circle colours; the circle stores an index. */
|
||||
export const CIRCLE_COLORS = ['#3a83f7', '#a78bfa', '#f472b6', '#f59e0b', '#10b981', '#22d3ee', '#ef4444', '#84cc16'];
|
||||
|
||||
export const circleDot = (c: Circle | undefined) =>
|
||||
E('i', { class: 'dl-circle-dot', style: `background:${CIRCLE_COLORS[c?.color ?? 0] ?? CIRCLE_COLORS[0]}` });
|
||||
|
||||
/** People whose devices can be reached at home (the mesh and home devices). */
|
||||
export const homeAccess = (p: Person) => p.access === 'both' || (p.access === 'lan' && !p.services?.length);
|
||||
|
||||
/* ---------- Home services ---------- */
|
||||
|
||||
export function serviceDialog(sv: Service | null, prefill: Partial<Service>, onSaved: () => void) {
|
||||
const name = input(sv?.name ?? prefill.name ?? '', { placeholder: 'NAS' });
|
||||
const addr = input(sv?.address ?? prefill.address ?? '', { placeholder: '192.168.1.10', class: 'cbi-input-text dl-mono' });
|
||||
const ports = input((sv?.ports ?? prefill.ports ?? []).join(', '), {
|
||||
placeholder: 'All ports, or e.g. 445, 5000',
|
||||
class: 'cbi-input-text dl-mono',
|
||||
});
|
||||
const field = (label: string, el: Node) =>
|
||||
E('div', { class: 'cbi-value' }, [E('label', { class: 'cbi-value-title' }, label), E('div', { class: 'cbi-value-field' }, el)]);
|
||||
modal(
|
||||
sv ? `Edit ${sv.name}` : 'Add service',
|
||||
[field('Name', name), field('Address', addr), field('Ports', ports)],
|
||||
[
|
||||
E('button', { class: 'cbi-button cbi-button-neutral', click: closeModal }, 'Cancel'),
|
||||
' ',
|
||||
button(
|
||||
'Save',
|
||||
async () => {
|
||||
const list = ports.value.split(/[ ,]+/).filter(Boolean);
|
||||
if (await attempt(() => api.serviceSet(sv?.id ?? '', name.value, addr.value, list), 'Saved')) {
|
||||
closeModal();
|
||||
onSaved();
|
||||
}
|
||||
},
|
||||
'positive',
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
/** Port groups a device at home offers: what it announces over Bonjour, or the usual ones. */
|
||||
const MDNS_LABEL: Record<string, string> = {
|
||||
_smb: 'SMB',
|
||||
_afpovertcp: 'AFP',
|
||||
_http: 'Web',
|
||||
_https: 'Web',
|
||||
_ssh: 'SSH',
|
||||
_sftp: 'SFTP',
|
||||
'_sftp-ssh': 'SFTP',
|
||||
_ipp: 'Printer',
|
||||
_ipps: 'Printer',
|
||||
_printer: 'Printer',
|
||||
'_pdl-datastream': 'Printer',
|
||||
_airplay: 'AirPlay',
|
||||
_raop: 'AirPlay',
|
||||
_rfb: 'Screen sharing',
|
||||
_googlecast: 'Cast',
|
||||
_hap: 'HomeKit',
|
||||
_rdp: 'Remote desktop',
|
||||
_ftp: 'FTP',
|
||||
};
|
||||
const DEFAULT_PORTS: [string, string[]][] = [
|
||||
['Web', ['80', '443']],
|
||||
['SMB', ['445']],
|
||||
['SSH', ['22']],
|
||||
];
|
||||
|
||||
function portGroups(h: HomeHost): [string, string[]][] {
|
||||
const by = new Map<string, Set<string>>();
|
||||
for (const s of h.services) {
|
||||
const label = MDNS_LABEL[s.type.split('.')[0]];
|
||||
if (!label || !s.port) continue;
|
||||
(by.get(label) ?? by.set(label, new Set()).get(label)!).add(String(s.port));
|
||||
}
|
||||
return by.size ? [...by].map(([l, p]) => [l, [...p].sort((a, b) => +a - +b)]) : DEFAULT_PORTS;
|
||||
}
|
||||
|
||||
/** Services shared by all servers, and the devices at home to add them from. */
|
||||
export function homeServices(st: Status, serverId: string, reload: () => void): HTMLElement {
|
||||
const services = st.services;
|
||||
const picker = E('div', { class: 'dl-stack gap8' }, E('span', { class: 'dl-sub' }, 'Looking for devices at home…'));
|
||||
|
||||
const rows = services.length
|
||||
? services.map((sv) =>
|
||||
E('div', { class: 'dl-row' }, [
|
||||
icon('home'),
|
||||
E('span', { class: 'dl-row-main dl-stack' }, [
|
||||
E('b', {}, sv.name),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-mono dl-faint' },
|
||||
`${sv.address}${sv.ports.length ? ` · ports ${sv.ports.join(', ')}` : ' · all ports'}`,
|
||||
),
|
||||
]),
|
||||
button('Edit', () => serviceDialog(sv, {}, reload)),
|
||||
button(
|
||||
[icon('trash')],
|
||||
async () => {
|
||||
if (
|
||||
(await confirmDialog(`Remove ${sv.name}?`, 'People limited to this service lose access to it.', 'Remove', true)) &&
|
||||
(await attempt(() => api.serviceDelete(sv.id), 'Removed'))
|
||||
)
|
||||
reload();
|
||||
},
|
||||
'neutral',
|
||||
{ title: 'Remove', 'aria-label': `Remove ${sv.name}` },
|
||||
),
|
||||
]),
|
||||
)
|
||||
: [E('div', { class: 'dl-row dl-muted' }, 'No services yet: pick ports of a device below.')];
|
||||
|
||||
/** Ports chosen for a device: add, change or remove its service at once. */
|
||||
async function choose(h: HomeHost, ports: string[] | null) {
|
||||
const sv = services.find((s) => s.address === h.address);
|
||||
const ok =
|
||||
ports === null
|
||||
? sv && (await attempt(() => api.serviceDelete(sv.id), `${sv.name} removed`))
|
||||
: await attempt(
|
||||
() => api.serviceSet(sv?.id ?? '', sv?.name ?? (h.name || h.address), h.address, ports),
|
||||
sv ? `${sv.name} updated` : `${h.name || h.address} added`,
|
||||
);
|
||||
if (ok) reload();
|
||||
}
|
||||
|
||||
function hostRow(h: HomeHost): HTMLElement {
|
||||
const sv = services.find((s) => s.address === h.address);
|
||||
const all = !!sv && !sv.ports.length;
|
||||
const chosen = new Set(sv?.ports ?? []);
|
||||
const chip = (label: string, on: boolean, click: () => void) =>
|
||||
E('button', { type: 'button', class: `dl-chipbtn${on ? ' on' : ''}`, 'aria-pressed': on ? 'true' : 'false', click }, label);
|
||||
return E('div', { class: 'dl-row' }, [
|
||||
icon(h.services.some((s) => s.type.startsWith('_ipp') || s.type.startsWith('_printer')) ? 'file' : 'computer'),
|
||||
E('span', { class: 'dl-row-main dl-stack' }, [E('b', {}, h.name || h.address), E('span', { class: 'dl-mono dl-faint' }, h.address)]),
|
||||
E('div', { class: 'dl-chips-row dl-host-ports' }, [
|
||||
chip('All ports', all, () => choose(h, all ? null : [])),
|
||||
...portGroups(h).map(([label, ports]) => {
|
||||
const on = !all && ports.every((p) => chosen.has(p));
|
||||
return chip(`${label} ${ports.join(', ')}`, on, () => {
|
||||
const next = new Set(all ? [] : chosen);
|
||||
for (const p of ports) {
|
||||
if (on) next.delete(p);
|
||||
else next.add(p);
|
||||
}
|
||||
choose(h, next.size ? [...next] : null);
|
||||
});
|
||||
}),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
api
|
||||
.homeHosts(serverId)
|
||||
.then((r) => {
|
||||
const open = r.hosts.some((h) => services.some((s) => s.address === h.address)) && !services.length;
|
||||
dom.content(
|
||||
picker,
|
||||
r.hosts.length
|
||||
? E('details', { class: 'dl-params', open: open ? '' : null }, [
|
||||
E('summary', {}, [
|
||||
icon('chevron'),
|
||||
E('span', {}, 'Add from devices at home'),
|
||||
E('span', { class: 'dl-pcount' }, String(r.hosts.length)),
|
||||
]),
|
||||
E('div', { class: 'dl-params-body' }, [
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
r.mdns
|
||||
? 'Ports they announce over Bonjour. Pick what to open, or all ports.'
|
||||
: 'Devices that got an address from this router. Pick the ports to open, or all ports.',
|
||||
),
|
||||
E('div', { class: 'dl-list' }, r.hosts.map(hostRow)),
|
||||
]),
|
||||
])
|
||||
: E('span', { class: 'dl-sub' }, 'No devices found in the home network right now.'),
|
||||
);
|
||||
})
|
||||
.catch(() => dom.content(picker, E('span', { class: 'dl-sub' }, "Couldn't read the devices at home.")));
|
||||
|
||||
return E('div', { class: 'dl-stack gap8' }, [
|
||||
E('div', { class: 'dl-iflead' }, [
|
||||
E('div', { class: 'dl-iflead-row' }, [
|
||||
E('b', {}, 'Home services'),
|
||||
button([icon('plus'), ' Add service'], () => serviceDialog(null, {}, reload)),
|
||||
]),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
'Home-only people can be limited to these instead of whole networks (chosen on their page). Shared by all servers.',
|
||||
),
|
||||
]),
|
||||
E('div', { class: 'dl-list' }, rows),
|
||||
picker,
|
||||
]);
|
||||
}
|
||||
|
||||
/* ---------- Circles ---------- */
|
||||
|
||||
export function circleDialog(st: Status, serverId: string, ci: Circle | null, onDone: () => void) {
|
||||
const used = new Set(st.circles.filter((c) => c.server === serverId).map((c) => c.color));
|
||||
let color = ci?.color ?? CIRCLE_COLORS.findIndex((_, i) => !used.has(i));
|
||||
if (color < 0) color = 0;
|
||||
const name = input(ci?.name ?? '', { placeholder: 'Family' });
|
||||
const people = st.people.filter((p) => p.server === serverId).sort((a, b) => a.name.localeCompare(b.name));
|
||||
const members = new Set(people.filter((p) => ci && p.circle === ci.id).map((p) => p.id));
|
||||
|
||||
const swatches = E('div', { class: 'dl-swatches', role: 'radiogroup', 'aria-label': 'Colour' });
|
||||
const paintSwatches = () =>
|
||||
dom.content(
|
||||
swatches,
|
||||
CIRCLE_COLORS.map((c, i) =>
|
||||
E('button', {
|
||||
type: 'button',
|
||||
role: 'radio',
|
||||
class: `dl-swatch${i === color ? ' on' : ''}`,
|
||||
style: `--sw:${c}`,
|
||||
'aria-checked': i === color ? 'true' : 'false',
|
||||
'aria-label': `Colour ${i + 1}`,
|
||||
click: () => {
|
||||
color = i;
|
||||
paintSwatches();
|
||||
},
|
||||
}),
|
||||
),
|
||||
);
|
||||
paintSwatches();
|
||||
|
||||
const chips = E(
|
||||
'div',
|
||||
{ class: 'dl-chips-row' },
|
||||
people.map((p) => {
|
||||
const other = p.circle && p.circle !== ci?.id ? st.circles.find((c) => c.id === p.circle) : undefined;
|
||||
return E(
|
||||
'button',
|
||||
{
|
||||
type: 'button',
|
||||
class: `dl-chipbtn${members.has(p.id) ? ' on' : ''}`,
|
||||
title: !homeAccess(p)
|
||||
? `${p.name} has no home access: their devices aren't reachable anyway`
|
||||
: other
|
||||
? `Now in ${other.name}`
|
||||
: '',
|
||||
click: (ev: Event) => {
|
||||
if (!members.delete(p.id)) members.add(p.id);
|
||||
(ev.currentTarget as HTMLElement).classList.toggle('on', members.has(p.id));
|
||||
},
|
||||
},
|
||||
[p.name, !homeAccess(p) ? E('b', {}, 'internet') : other ? E('b', {}, other.name) : ''],
|
||||
);
|
||||
}),
|
||||
);
|
||||
const field = (label: string, el: Node) =>
|
||||
E('div', { class: 'cbi-value' }, [E('label', { class: 'cbi-value-title' }, label), E('div', { class: 'cbi-value-field' }, el)]);
|
||||
|
||||
modal(
|
||||
ci ? `Edit ${ci.name}` : 'New circle',
|
||||
[
|
||||
field('Name', name),
|
||||
field('Colour', swatches),
|
||||
field('People', chips),
|
||||
E('p', { class: 'dl-sub' }, 'Devices of people in one circle reach each other. A person is in one circle at a time.'),
|
||||
],
|
||||
[
|
||||
ci
|
||||
? button(
|
||||
'Delete',
|
||||
async () => {
|
||||
if (await attempt(() => api.circleDelete(ci.id), `${ci.name} deleted`)) {
|
||||
closeModal();
|
||||
onDone();
|
||||
}
|
||||
},
|
||||
'negative',
|
||||
)
|
||||
: '',
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
E('button', { class: 'cbi-button cbi-button-neutral', click: closeModal }, 'Cancel'),
|
||||
' ',
|
||||
button(
|
||||
'Save',
|
||||
async () => {
|
||||
if (await attempt(() => api.circleSet(ci?.id ?? '', serverId, name.value, color, [...members]), 'Saved')) {
|
||||
closeModal();
|
||||
onDone();
|
||||
}
|
||||
},
|
||||
'positive',
|
||||
),
|
||||
],
|
||||
'dl-circle-modal',
|
||||
);
|
||||
}
|
||||
|
||||
/** The server's circles as chips (click to edit) and a round "+" to add one. */
|
||||
export function circleChips(st: Status, serverId: string, onDone: () => void): HTMLElement {
|
||||
const list = st.circles.filter((c) => c.server === serverId);
|
||||
return E('div', { class: 'dl-chips-row dl-circles' }, [
|
||||
...list.map((c) => {
|
||||
const who = st.people.filter((p) => p.circle === c.id).map((p) => p.name);
|
||||
return E(
|
||||
'button',
|
||||
{ type: 'button', class: 'dl-chip', title: `Edit ${c.name}`, click: () => circleDialog(st, serverId, c, onDone) },
|
||||
[circleDot(c), E('b', {}, c.name), E('span', { class: 'dl-faint' }, who.length ? who.join(', ') : 'nobody yet')],
|
||||
);
|
||||
}),
|
||||
E(
|
||||
'button',
|
||||
{
|
||||
type: 'button',
|
||||
class: 'dl-chip add',
|
||||
title: 'New circle',
|
||||
'aria-label': 'New circle',
|
||||
click: () => circleDialog(st, serverId, null, onDone),
|
||||
},
|
||||
icon('plus'),
|
||||
),
|
||||
]);
|
||||
}
|
||||
|
||||
/* ---------- Who reaches what ---------- */
|
||||
|
||||
export function whoReaches(st: Status, srv: Server): HTMLElement {
|
||||
const people = st.people.filter((p) => p.server === srv.id);
|
||||
const yes = (t = '') => E('span', { class: 'dl-yes' }, [icon('check'), t]);
|
||||
const no = () => E('span', { class: 'dl-faint' }, '—');
|
||||
const home = (list: Person[]) => {
|
||||
const kinds = new Set(list.map((p) => (p.access === 'lan' && p.services?.length ? 'services' : p.home_nets?.length ? 'some' : 'all')));
|
||||
if (!kinds.size) kinds.add('all');
|
||||
return yes([...kinds].map((k) => ({ all: 'all networks', some: 'their networks', services: 'services' })[k]).join(' / '));
|
||||
};
|
||||
const each = () => (srv.mesh === 'off' ? no() : srv.mesh === 'circles' ? yes('circle') : yes());
|
||||
const net = srv.lan_like ? 'like home' : 'direct';
|
||||
const row = (label: string, list: Person[], cells: Node[]) =>
|
||||
E('tr', {}, [
|
||||
E('td', {}, [E('b', {}, label), E('div', { class: 'dl-sub' }, `${list.length} ${list.length === 1 ? 'person' : 'people'}`)]),
|
||||
...cells.map((c) => E('td', {}, c)),
|
||||
]);
|
||||
const by = (a: string) => people.filter((p) => p.access === a);
|
||||
return E('section', { class: 'dl-setsec' }, [
|
||||
E('div', { class: 'dl-setsec-body' }, [
|
||||
E('div', { class: 'dl-panel-head' }, [
|
||||
E('h3', {}, 'Who reaches what'),
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
E('span', { class: 'dl-sub' }, 'From the rules on this server'),
|
||||
]),
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-reach-wrap' },
|
||||
E('table', { class: 'dl-table dl-reach' }, [
|
||||
E(
|
||||
'tr',
|
||||
{},
|
||||
['', 'Internet', 'Home', 'This router', 'Each other'].map((t) => E('th', {}, t)),
|
||||
),
|
||||
row('Internet', by('internet'), [yes(net), no(), E('span', { class: 'dl-faint' }, 'DNS'), no()]),
|
||||
row('Home', by('lan'), [E('span', { class: 'dl-faint' }, 'their own'), home(by('lan')), yes(), each()]),
|
||||
row('Both', by('both'), [yes(net), home(by('both')), yes(), each()]),
|
||||
]),
|
||||
),
|
||||
E(
|
||||
'p',
|
||||
{ class: 'dl-sub' },
|
||||
'Home devices reach the devices of people with home access, on the networks those people reach. Paused, ended and over-the-limit people reach nothing.',
|
||||
),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
/* ---------- Check access ---------- */
|
||||
|
||||
export function checkAccess(st: Status, srv: Server): HTMLElement {
|
||||
const devs = st.people
|
||||
.filter((p) => p.server === srv.id)
|
||||
.flatMap((p) => p.devices.map((d) => ({ id: d.id, label: `${p.name} · ${d.name}` })))
|
||||
.sort((a, b) => a.label.localeCompare(b.label));
|
||||
const ADDR = '@addr';
|
||||
/** A device, or an address typed in. */
|
||||
const end = (placeholder: string, initial: string) => {
|
||||
const sel = E('select', { class: 'cbi-input-select', 'aria-label': placeholder }, [
|
||||
...devs.map((d) => E('option', { value: d.id, selected: d.id === initial ? 'selected' : null }, d.label)),
|
||||
E('option', { value: ADDR, selected: initial === ADDR ? 'selected' : null }, 'Address'),
|
||||
]) as HTMLSelectElement;
|
||||
const addr = input('', { placeholder, class: 'cbi-input-text dl-mono' });
|
||||
const wrap = E('div', { class: 'dl-check-end' }, [sel, addr]);
|
||||
const sync = () => (addr.hidden = sel.value !== ADDR);
|
||||
sel.addEventListener('change', sync);
|
||||
sync();
|
||||
return { el: wrap, value: () => (sel.value === ADDR ? addr.value.trim() : sel.value) };
|
||||
};
|
||||
const from = end('10.0.1.11', devs[0]?.id ?? ADDR);
|
||||
const to = end('10.0.1.20:445', ADDR);
|
||||
const out = E('div', { class: 'dl-stack gap8' });
|
||||
const run = async () => {
|
||||
const r = await attempt(() => api.accessCheck(from.value(), to.value()));
|
||||
if (!r) return;
|
||||
const stop = r.steps.findIndex((s) => !s.ok);
|
||||
dom.content(out, [
|
||||
E('div', { class: `dl-verdict ${r.ok ? 'ok' : 'bad'}` }, [
|
||||
E('b', {}, r.ok ? 'Allowed' : 'Blocked'),
|
||||
E('span', { class: 'dl-sub' }, r.ok ? 'Every step lets it through' : `Stops at step ${stop + 1} of ${r.steps.length}`),
|
||||
]),
|
||||
E(
|
||||
'ul',
|
||||
{ class: 'dl-checks' },
|
||||
r.steps.map((s) =>
|
||||
E('li', {}, [
|
||||
E('span', { class: `dl-check-icon ${s.ok ? 'ok' : 'error'}` }, icon(s.ok ? 'check' : 'x')),
|
||||
E('div', { class: 'dl-check-body' }, [
|
||||
E('div', { class: 'dl-check-title' }, s.title),
|
||||
s.detail ? E('div', { class: 'dl-check-detail' }, s.detail) : '',
|
||||
]),
|
||||
]),
|
||||
),
|
||||
),
|
||||
]);
|
||||
};
|
||||
return E('section', { class: 'dl-setsec' }, [
|
||||
E('div', { class: 'dl-setsec-body' }, [
|
||||
E('div', { class: 'dl-panel-head' }, [
|
||||
E('h3', {}, 'Check access'),
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
E('span', { class: 'dl-sub' }, 'Why something does or does not connect'),
|
||||
]),
|
||||
E('div', { class: 'dl-check-form' }, [from.el, E('span', { class: 'dl-faint' }, '→'), to.el, button('Check', run)]),
|
||||
out,
|
||||
]),
|
||||
]);
|
||||
}
|
||||
+36
-4
@@ -1,6 +1,6 @@
|
||||
// luci.dawnline RPC bindings. The backend reports failures as { error }.
|
||||
|
||||
import type { AwgCaps, ClientConfig, DayUsage, HealthCheck, LogEvent, Person, Status } from '../shared/types';
|
||||
import type { AwgCaps, Circle, ClientConfig, DayUsage, HealthCheck, LogEvent, MeshMode, Person, Status } from '../shared/types';
|
||||
|
||||
function call<T>(method: string, params: string[] = []) {
|
||||
const fn = rpc.declare<any>({ object: 'luci.dawnline', method, params });
|
||||
@@ -95,6 +95,7 @@ export interface Needs {
|
||||
https: string[];
|
||||
acme: string[];
|
||||
home: string[];
|
||||
bonjour: string[];
|
||||
}
|
||||
|
||||
export interface SettingsData {
|
||||
@@ -178,8 +179,18 @@ export interface InterfacesData {
|
||||
ifname: string;
|
||||
detected: { wan: string | null; lan: string | null };
|
||||
saved: { wan: string; lan: string };
|
||||
config: { auto_wan: boolean; wan_device: string; auto_lan: boolean; lan_devices: string[]; lan_like: boolean; device_mesh: boolean };
|
||||
config: {
|
||||
auto_wan: boolean;
|
||||
wan_device: string;
|
||||
auto_lan: boolean;
|
||||
lan_devices: string[];
|
||||
lan_like: boolean;
|
||||
device_mesh: boolean;
|
||||
mesh: MeshMode;
|
||||
};
|
||||
like_home: LikeHome;
|
||||
/** Find home devices: published from umdns as DNS-SD records. */
|
||||
bonjour: { on: boolean; needs: string[]; running: boolean; services: number };
|
||||
effective: {
|
||||
wan: { dev: string | null; zone: string; auto: boolean; missing: boolean };
|
||||
home: { dev: string; auto: boolean; nets: string[]; zone: string | null; missing: boolean }[];
|
||||
@@ -193,6 +204,20 @@ export interface InterfacesData {
|
||||
nets_changed?: boolean;
|
||||
}
|
||||
|
||||
/** "Check access": each rule on the way, in order; it stops at the first that fails. */
|
||||
export interface AccessCheck {
|
||||
ok: boolean;
|
||||
steps: { ok: boolean; title: string; detail: string }[];
|
||||
}
|
||||
|
||||
/** A device at home (DHCP lease or static host) and the services it announces over Bonjour. */
|
||||
export interface HomeHost {
|
||||
address: string;
|
||||
name: string;
|
||||
mac: string;
|
||||
services: { type: string; name: string; port: number }[];
|
||||
}
|
||||
|
||||
/** Filters for logs_clear; all empty clears the whole log. */
|
||||
export interface LogFilter {
|
||||
person?: string;
|
||||
@@ -221,7 +246,7 @@ export type PersonPatch = Partial<
|
||||
| 'dns_mode',
|
||||
string
|
||||
>
|
||||
> & { paused?: boolean; services?: string[] };
|
||||
> & { paused?: boolean; services?: string[]; circle?: string; home_nets?: string[] };
|
||||
|
||||
const personUpdateRaw = rpc.declare<any>({
|
||||
object: 'luci.dawnline',
|
||||
@@ -242,6 +267,8 @@ const personUpdateRaw = rpc.declare<any>({
|
||||
'dns_mode',
|
||||
'paused',
|
||||
'services',
|
||||
'circle',
|
||||
'home_nets',
|
||||
],
|
||||
});
|
||||
|
||||
@@ -260,7 +287,7 @@ async function personUpdate(id: string, patch: PersonPatch): Promise<{ person: P
|
||||
'note',
|
||||
'dns_mode',
|
||||
] as const;
|
||||
const args: unknown[] = [id, ...keys.map((k) => patch[k]), patch.paused, patch.services];
|
||||
const args: unknown[] = [id, ...keys.map((k) => patch[k]), patch.paused, patch.services, patch.circle, patch.home_nets];
|
||||
const r = await personUpdateRaw(...args);
|
||||
if (r && typeof r.error === 'string') throw new Error(r.error);
|
||||
return r;
|
||||
@@ -324,7 +351,12 @@ export const api = {
|
||||
'lan_devices',
|
||||
'lan_like',
|
||||
'device_mesh',
|
||||
'mesh',
|
||||
]),
|
||||
circleSet: call<{ id: string; circles: Circle[] }>('circle_set', ['id', 'server', 'name', 'color', 'members']),
|
||||
circleDelete: call<{ circles: Circle[] }>('circle_delete', ['id']),
|
||||
accessCheck: call<AccessCheck>('access_check', ['from', 'to']),
|
||||
homeHosts: call<{ hosts: HomeHost[]; mdns: boolean }>('home_hosts', ['id']),
|
||||
usageClear: call<unknown>('usage_clear', ['scope', 'id']),
|
||||
uninstall: call<unknown>('uninstall', ['confirm']),
|
||||
status,
|
||||
|
||||
+235
-96
@@ -1,8 +1,10 @@
|
||||
// Interfaces card (Server page): auto-detected WAN and LAN, plus a picker for
|
||||
// the interfaces that make up a server's home network.
|
||||
|
||||
import type { MeshMode, Server, Status } from '../shared/types';
|
||||
import { E } from './e';
|
||||
import { api, type IfaceCategory, type InterfacesData, type NetDevice } from './api';
|
||||
import { circleChips, homeServices } from './access';
|
||||
import { attempt, button, notify } from './ui';
|
||||
import { installMissing } from './pkgs';
|
||||
import { attachTip } from './charts';
|
||||
@@ -46,22 +48,32 @@ function sw(on: boolean, label: string, onChange: (v: boolean) => void): HTMLBut
|
||||
return b;
|
||||
}
|
||||
|
||||
export function interfacesCard(serverId: string, title = 'Interfaces'): HTMLElement {
|
||||
/**
|
||||
* Server → Access: how internet traffic leaves (Internet) and what home access
|
||||
* reaches (Home network: networks, devices reaching each other, services).
|
||||
* Both cards share one draft; either Save stores it.
|
||||
*/
|
||||
export function accessCards(srv: Server, st: Status, reload: () => void): HTMLElement {
|
||||
const serverId = srv.id;
|
||||
const root = E(
|
||||
'section',
|
||||
{ class: 'dl-setsec dl-ifcard' },
|
||||
E('div', { class: 'dl-setsec-body' }, E('p', { class: 'dl-muted' }, 'Loading interfaces…')),
|
||||
'div',
|
||||
{ class: 'dl-stack gap16' },
|
||||
E('section', { class: 'dl-setsec' }, E('div', { class: 'dl-setsec-body' }, E('p', { class: 'dl-muted' }, 'Loading interfaces…'))),
|
||||
);
|
||||
let d: InterfacesData;
|
||||
let autoWan = true,
|
||||
wanDev = '',
|
||||
autoLan = true,
|
||||
lanLike = true,
|
||||
mesh = true;
|
||||
mesh: MeshMode = 'all';
|
||||
// "Other interfaces" stays open or folded across repaints.
|
||||
let otherOpen = false;
|
||||
// Built once: it reads the devices at home, which should not happen on every repaint.
|
||||
const services = homeServices(st, serverId, reload);
|
||||
let lans = new Set<string>();
|
||||
let initial = '';
|
||||
|
||||
const snapshot = () => JSON.stringify([lanLike, mesh, autoWan, autoWan ? '' : wanDev, autoLan, [...lans].sort()]);
|
||||
const snapshot = () => JSON.stringify([lanLike, autoWan, autoWan ? '' : wanDev, autoLan, [...lans].sort()]);
|
||||
const liveLan = () => d.detected.lan || d.saved.lan || '';
|
||||
const currentWan = () => (autoWan ? d.detected.wan || d.saved.wan : wanDev) || '';
|
||||
const byName = () => new Map(d.devices.map((x) => [x.name, x]));
|
||||
@@ -80,7 +92,7 @@ export function interfacesCard(serverId: string, title = 'Interfaces'): HTMLElem
|
||||
wanDev = r.config.wan_device || r.detected.wan || r.saved.wan || '';
|
||||
autoLan = r.config.auto_lan;
|
||||
lanLike = r.config.lan_like;
|
||||
mesh = r.config.device_mesh;
|
||||
mesh = r.config.mesh ?? (r.config.device_mesh ? 'all' : 'off');
|
||||
lans = new Set(r.config.lan_devices);
|
||||
initial = snapshot();
|
||||
}
|
||||
@@ -95,6 +107,13 @@ export function interfacesCard(serverId: string, title = 'Interfaces'): HTMLElem
|
||||
if (r) take(r, reset);
|
||||
};
|
||||
|
||||
/** Can be part of the home network (or already is). */
|
||||
function pickable(x: NetDevice): boolean {
|
||||
const isAuto = autoLan && x.name === liveLan();
|
||||
const blocked = !!x.own || !!x.master || x.name === currentWan() || isAuto;
|
||||
return isAuto || lans.has(x.name) || (!blocked && (x.nets.length > 0 || !!x.missing));
|
||||
}
|
||||
|
||||
function tile(x: NetDevice): HTMLElement {
|
||||
const isAuto = autoLan && x.name === liveLan();
|
||||
const isWan = x.name === currentWan();
|
||||
@@ -179,6 +198,35 @@ export function interfacesCard(serverId: string, title = 'Interfaces'): HTMLElem
|
||||
];
|
||||
}
|
||||
|
||||
const MESH_TEXT: Record<MeshMode, string> = {
|
||||
off: "Devices of different people never reach each other; a person's own devices don't either.",
|
||||
all: 'Devices of people with home access reach each other, like home devices do. Internet-only people never.',
|
||||
circles: 'Within a circle: family sees family, guests see guests. Everyone reaches their own devices. Internet-only people never.',
|
||||
};
|
||||
|
||||
function setrow(
|
||||
ic: string,
|
||||
label: (Node | string)[] | string,
|
||||
sub: (Node | string)[] | string,
|
||||
ctl: Node | (Node | string)[] | '',
|
||||
tone = '',
|
||||
below?: Node,
|
||||
) {
|
||||
return E('div', { class: below ? 'dl-setrow head' : 'dl-setrow' }, [
|
||||
E('div', { class: 'dl-lh-main' }, [
|
||||
E('span', { class: `dl-need-ic ${tone}` }, icon(ic)),
|
||||
E('div', { class: 'dl-stack' }, [E('span', { class: 'dl-setrow-label' }, label), E('span', { class: 'dl-sub' }, sub), below ?? '']),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow-ctl' }, ctl),
|
||||
]);
|
||||
}
|
||||
|
||||
const hint = (live: string | null, saved: string) => {
|
||||
const mono = (t: string) => E('span', { class: 'dl-mono' }, t);
|
||||
if (live) return E('span', {}, [' Now: ', mono(live), ...(saved && saved !== live ? [', was ', mono(saved)] : []), '.']);
|
||||
return E('span', {}, saved ? [' Not found now: using ', mono(saved), '.'] : [' Not found.']);
|
||||
};
|
||||
|
||||
function paint() {
|
||||
const wanSel = E(
|
||||
'select',
|
||||
@@ -195,27 +243,21 @@ export function interfacesCard(serverId: string, title = 'Interfaces'): HTMLElem
|
||||
.map((x) => E('option', { value: x.name, selected: x.name === wanDev ? 'selected' : null }, `${x.name} · zone ${x.zone}`)),
|
||||
) as HTMLSelectElement;
|
||||
|
||||
// What auto-detection finds now; the remembered one (used when nothing is found) only when it differs.
|
||||
const hint = (live: string | null, saved: string) => {
|
||||
const mono = (t: string) => E('span', { class: 'dl-mono' }, t);
|
||||
if (live) return E('span', {}, [' Now: ', mono(live), ...(saved && saved !== live ? [', was ', mono(saved)] : []), '.']);
|
||||
return E('span', {}, saved ? [' Not found now: using ', mono(saved), '.'] : [' Not found.']);
|
||||
};
|
||||
|
||||
const groups = GROUPS.map(([cat, label]) => {
|
||||
const list = d.devices.filter((x) => x.category === cat);
|
||||
return list.length ? E('div', { class: 'dl-ifgroup' }, [E('h4', {}, label), E('div', { class: 'dl-ifgrid' }, list.map(tile))]) : '';
|
||||
});
|
||||
|
||||
const home = homeDevs();
|
||||
const nets = home.flatMap((x) => x.nets.map((n) => [n, x.name] as const));
|
||||
const dirty = snapshot() !== initial;
|
||||
const save = button(
|
||||
// Draft vs saved, per card: [lanLike, autoWan, wan, autoLan, lans].
|
||||
const now = JSON.parse(snapshot()) as unknown[];
|
||||
const was = JSON.parse(initial) as unknown[];
|
||||
const changed = (...i: number[]) => i.some((k) => JSON.stringify(now[k]) !== JSON.stringify(was[k]));
|
||||
const netDirty = changed(0, 1, 2);
|
||||
const homeDirty = changed(3, 4);
|
||||
const save = (on: boolean) =>
|
||||
button(
|
||||
'Save',
|
||||
async () => {
|
||||
const r = await attempt(
|
||||
() => api.serverInterfaces(serverId, autoWan, autoWan ? '' : wanDev, autoLan, [...lans], lanLike, mesh),
|
||||
'Interfaces saved',
|
||||
() => api.serverInterfaces(serverId, autoWan, autoWan ? '' : wanDev, autoLan, [...lans], lanLike, mesh !== 'off', mesh),
|
||||
'Access saved',
|
||||
);
|
||||
if (!r) return;
|
||||
take(r, true);
|
||||
@@ -227,114 +269,211 @@ export function interfacesCard(serverId: string, title = 'Interfaces'): HTMLElem
|
||||
);
|
||||
},
|
||||
'positive',
|
||||
{ disabled: !dirty },
|
||||
{ disabled: !on },
|
||||
);
|
||||
|
||||
dom.content(root, [
|
||||
const internet = E('section', { class: 'dl-setsec dl-ifcard' }, [
|
||||
E('div', { class: 'dl-setsec-body' }, [
|
||||
E('div', { class: 'dl-panel-head' }, [
|
||||
E('h3', {}, title),
|
||||
E('h3', {}, 'Internet'),
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
button([icon('reset'), ' Rescan'], () => load(false), 'neutral', { title: 'Read the interfaces again' }),
|
||||
E('span', { class: 'dl-sub' }, 'People with Internet or Both'),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow' }, [
|
||||
E('div', { class: 'dl-lh-main' }, [
|
||||
E('span', { class: `dl-need-ic ${likeHomeTone()}` }, icon('home')),
|
||||
E('div', { class: 'dl-stack' }, [
|
||||
E('span', { class: 'dl-setrow-label' }, 'Internet like a home device'),
|
||||
E('span', { class: 'dl-sub' }, likeHomeText()),
|
||||
]),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow-ctl dl-if-wanctl' }, [
|
||||
setrow(
|
||||
'home',
|
||||
'Internet like a home device',
|
||||
likeHomeText(),
|
||||
[
|
||||
lanLike && d.needs?.length ? button('Install', () => installMissing('home', d.needs!, () => load(false)), 'positive') : '',
|
||||
sw(lanLike, 'Internet like a home device', (v) => {
|
||||
lanLike = v;
|
||||
paint();
|
||||
}),
|
||||
]),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow' }, [
|
||||
E('div', { class: 'dl-lh-main' }, [
|
||||
E('span', { class: 'dl-need-ic' }, icon('link')),
|
||||
E('div', { class: 'dl-stack' }, [
|
||||
E('span', { class: 'dl-setrow-label' }, 'Devices reach each other'),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
'Devices of people with Home access can open connections to each other on this server, like home devices do. Internet-only people never.',
|
||||
],
|
||||
likeHomeTone(),
|
||||
),
|
||||
]),
|
||||
]),
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-setrow-ctl' },
|
||||
sw(mesh, 'Devices reach each other', (v) => {
|
||||
mesh = v;
|
||||
paint();
|
||||
}),
|
||||
),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow' }, [
|
||||
E('div', { class: 'dl-lh-main' }, [
|
||||
E('span', { class: 'dl-need-ic' }, icon('globe')),
|
||||
E('div', { class: 'dl-stack' }, [
|
||||
E('span', { class: 'dl-setrow-label' }, 'Auto-detect WAN'),
|
||||
E('span', { class: 'dl-sub' }, [
|
||||
setrow(
|
||||
'globe',
|
||||
'Auto-detect WAN',
|
||||
[
|
||||
'The interface with the default route: the server port opens there and Internet access leaves through it.',
|
||||
hint(d.detected.wan, d.saved.wan),
|
||||
]),
|
||||
]),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow-ctl dl-if-wanctl' }, [
|
||||
],
|
||||
[
|
||||
autoWan ? '' : wanSel,
|
||||
sw(autoWan, 'Auto-detect WAN', (v) => {
|
||||
autoWan = v;
|
||||
paint();
|
||||
}),
|
||||
]),
|
||||
]),
|
||||
E('div', { class: 'dl-setrow' }, [
|
||||
E('div', { class: 'dl-lh-main' }, [
|
||||
E('span', { class: 'dl-need-ic' }, icon('network')),
|
||||
E('div', { class: 'dl-stack' }, [
|
||||
E('span', { class: 'dl-setrow-label' }, 'Auto-detect LAN'),
|
||||
E('span', { class: 'dl-sub' }, ['Adds the detected LAN to the home network.', hint(d.detected.lan, d.saved.lan)]),
|
||||
]),
|
||||
]),
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-setrow-ctl' },
|
||||
sw(autoLan, 'Auto-detect LAN', (v) => {
|
||||
autoLan = v;
|
||||
paint();
|
||||
}),
|
||||
],
|
||||
),
|
||||
]),
|
||||
E('div', { class: 'dl-iflead' }, [
|
||||
E('b', {}, 'Home network'),
|
||||
E('div', { class: 'dl-setsec-foot' }, [
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
'What people with Home access can reach, and where their devices can be reached from. Click to add an interface; bridge ports and Wi-Fi in a bridge come with the bridge.',
|
||||
lanLike
|
||||
? ['Internet like a home device', currentWan() ? [' · leaves through ', E('span', { class: 'dl-mono' }, currentWan())] : '']
|
||||
: currentWan()
|
||||
? ['Internet straight to ', E('span', { class: 'dl-mono' }, currentWan())]
|
||||
: 'No WAN found',
|
||||
),
|
||||
save(netDirty),
|
||||
]),
|
||||
...groups,
|
||||
]);
|
||||
|
||||
const meshSeg = E(
|
||||
'div',
|
||||
{ class: 'dl-seg sm', role: 'radiogroup', 'aria-label': 'Devices reach each other' },
|
||||
(
|
||||
[
|
||||
['off', 'Off'],
|
||||
['all', 'Everyone'],
|
||||
['circles', 'Circles'],
|
||||
] as const
|
||||
).map(([v, t]) =>
|
||||
E(
|
||||
'button',
|
||||
{
|
||||
type: 'button',
|
||||
role: 'radio',
|
||||
class: mesh === v ? 'on' : '',
|
||||
'aria-checked': mesh === v ? 'true' : 'false',
|
||||
// Applies at once, like the choices on a person's page.
|
||||
click: async () => {
|
||||
if (mesh === v) return;
|
||||
if (await attempt(() => api.serverUpdate(serverId, { mesh: v }), `Devices reach each other: ${t}`)) reload();
|
||||
},
|
||||
},
|
||||
t,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
const homeCard = E('section', { class: 'dl-setsec dl-ifcard' }, [
|
||||
E('div', { class: 'dl-setsec-body' }, [
|
||||
E('div', { class: 'dl-panel-head' }, [
|
||||
E('h3', {}, 'Home network'),
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
E('span', { class: 'dl-sub' }, 'People with Home or Both'),
|
||||
button([icon('reset'), ' Rescan'], () => load(false), 'neutral', { title: 'Read the interfaces again' }),
|
||||
]),
|
||||
setrow(
|
||||
'network',
|
||||
'Networks',
|
||||
'Everyone with home access reaches these, unless their page leaves one out; their devices can be reached from here too. Click one to add or remove it.',
|
||||
'',
|
||||
'',
|
||||
netPicker(),
|
||||
),
|
||||
setrow(
|
||||
'link',
|
||||
'Devices reach each other',
|
||||
MESH_TEXT[mesh],
|
||||
meshSeg,
|
||||
'',
|
||||
mesh === 'circles' ? circleChips(st, serverId, reload) : undefined,
|
||||
),
|
||||
bonjourRow(),
|
||||
services,
|
||||
]),
|
||||
E('div', { class: 'dl-setsec-foot' }, [
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub dl-if-summary' },
|
||||
nets.length
|
||||
? [
|
||||
'Home access reaches ',
|
||||
...nets.flatMap(([n, dev], i) => [i ? ', ' : '', E('span', { class: 'dl-mono' }, n), ` (${dev})`]),
|
||||
lanLike ? ' · Internet like a home device' : currentWan() ? ` · Internet via ${currentWan()}` : '',
|
||||
]
|
||||
: ['No home network: Home access reaches nothing but this router.', currentWan() ? ` Internet via ${currentWan()}.` : ''],
|
||||
? ['Home access reaches ', ...nets.flatMap(([n, dev], i) => [i ? ', ' : '', E('span', { class: 'dl-mono' }, n), ` (${dev})`])]
|
||||
: 'No home network: Home access reaches nothing but this router.',
|
||||
),
|
||||
save,
|
||||
save(homeDirty),
|
||||
]),
|
||||
]);
|
||||
|
||||
// Keep the page where it is: replacing the cards would otherwise jump to the top.
|
||||
const y = window.scrollY;
|
||||
root.style.minHeight = `${root.offsetHeight}px`;
|
||||
dom.content(root, [internet, homeCard]);
|
||||
root.style.minHeight = '';
|
||||
window.scrollTo({ top: y });
|
||||
}
|
||||
|
||||
/** Find home devices: AirPlay, printers and shared Macs listed on Apple devices over the tunnel. */
|
||||
function bonjourRow(): HTMLElement {
|
||||
const b = d.bonjour;
|
||||
const set = async (on: boolean) => {
|
||||
if (await attempt(() => api.serverUpdate(serverId, { bonjour: on }), on ? 'Finding home devices' : 'Home devices no longer listed'))
|
||||
load(false);
|
||||
};
|
||||
const state = b.needs.length
|
||||
? E('span', { class: 'dl-warn' }, ` Needs ${b.needs.join(', ')}.`)
|
||||
: b.on && !b.running
|
||||
? E('span', { class: 'dl-warn' }, ' umdns is not running.')
|
||||
: b.on
|
||||
? ` Listing ${b.services} service${b.services === 1 ? '' : 's'} from home now.`
|
||||
: '';
|
||||
return setrow(
|
||||
'wifi',
|
||||
['Find home devices ', E('span', { class: 'dl-faint dl-w400' }, '· Bonjour')],
|
||||
[
|
||||
'iPhone, iPad and Mac on the VPN see AirPlay, printers and shared Macs at home, as on Wi-Fi. Android and Chromecast look only on the local network.',
|
||||
state,
|
||||
],
|
||||
b.needs.length
|
||||
? button('Install', () => installMissing('bonjour', b.needs, () => load(false)), 'positive')
|
||||
: sw(b.on, 'Find home devices', (v) => set(v)),
|
||||
b.on && b.running ? 'ok' : '',
|
||||
);
|
||||
}
|
||||
|
||||
/** Interfaces that can be home networks as tiles; the rest folded, by kind. */
|
||||
function netPicker(): HTMLElement {
|
||||
const avail = d.devices.filter(pickable);
|
||||
const rest = d.devices.filter((x) => !pickable(x));
|
||||
return E('div', { class: 'dl-stack gap8 dl-netpick' }, [
|
||||
avail.length
|
||||
? E('div', { class: 'dl-ifgrid' }, avail.map(tile))
|
||||
: E('span', { class: 'dl-warn' }, 'No home network: Home access reaches nothing but this router.'),
|
||||
E('label', { class: 'dl-boxrow' }, [
|
||||
E('span', { class: 'dl-stack' }, [
|
||||
E('span', {}, 'Auto-detect LAN'),
|
||||
E('span', { class: 'dl-sub' }, ['Adds the LAN this router uses.', hint(d.detected.lan, d.saved.lan)]),
|
||||
]),
|
||||
sw(autoLan, 'Auto-detect LAN', (v) => {
|
||||
autoLan = v;
|
||||
paint();
|
||||
}),
|
||||
]),
|
||||
rest.length
|
||||
? E(
|
||||
'details',
|
||||
{
|
||||
class: 'dl-params',
|
||||
open: otherOpen ? '' : null,
|
||||
toggle: (ev: Event) => (otherOpen = (ev.currentTarget as HTMLDetailsElement).open),
|
||||
},
|
||||
[
|
||||
E('summary', {}, [
|
||||
icon('chevron'),
|
||||
E('span', {}, 'Other interfaces'),
|
||||
E('span', { class: 'dl-pcount' }, String(rest.length)),
|
||||
]),
|
||||
E('div', { class: 'dl-params-body' }, [
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
'The WAN, this server, ports and Wi-Fi of a bridge (they come with it) and interfaces without an IPv4 network.',
|
||||
),
|
||||
...GROUPS.map(([cat, label]) => {
|
||||
const list = rest.filter((x) => x.category === cat);
|
||||
return list.length
|
||||
? E('div', { class: 'dl-ifgroup' }, [E('h4', {}, label), E('div', { class: 'dl-ifgrid' }, list.map(tile))])
|
||||
: '';
|
||||
}),
|
||||
]),
|
||||
],
|
||||
)
|
||||
: '',
|
||||
]);
|
||||
}
|
||||
|
||||
load(true);
|
||||
|
||||
@@ -73,6 +73,11 @@ export function eventText(st: Status, e: LogEvent): Node[] {
|
||||
const b = (t: string) => E('b', {}, t);
|
||||
const m = (t: string) => E('span', { class: 'dl-muted' }, t);
|
||||
const mono = (t: string) => E('span', { class: 'dl-mono' }, t);
|
||||
/** An address; at home, the name of the device that has it, with the address in brackets. */
|
||||
const addr = (ip: string) =>
|
||||
e.hosts?.[ip]
|
||||
? [E('span', { class: 'dl-ev-host' }, [E('b', {}, e.hosts[ip]), E('span', { class: 'dl-faint' }, ` (${ip})`)])]
|
||||
: [mono(ip)];
|
||||
// What the bold name is (a person, a device), said before it in grey.
|
||||
const kind = (t: string) => E('span', { class: 'dl-ev-kind' }, `${t} `);
|
||||
const wd = dev ? `${who} · ${dev}` : who;
|
||||
@@ -116,13 +121,18 @@ export function eventText(st: Status, e: LogEvent): Node[] {
|
||||
kind('Device'),
|
||||
b(wd),
|
||||
m(' connected'),
|
||||
...(e.detail ? [m(' from '), mono(e.detail)] : []),
|
||||
...(e.detail ? [m(' from '), ...addr(e.detail)] : []),
|
||||
...(e.where ? [m(` · ${e.where}`)] : []),
|
||||
];
|
||||
case 'disconnect':
|
||||
return [kind('Device'), b(wd), m(' went offline')];
|
||||
case 'roam':
|
||||
return [kind('Device'), b(wd), m(' changed network '), mono(e.detail ?? '')];
|
||||
return [
|
||||
kind('Device'),
|
||||
b(wd),
|
||||
m(' changed network '),
|
||||
...(e.detail ?? '').split(' → ').flatMap((ip, i) => (i ? [m(' → '), ...addr(ip)] : addr(ip))),
|
||||
];
|
||||
case 'device_added':
|
||||
return [
|
||||
kind('Person'),
|
||||
|
||||
@@ -29,6 +29,7 @@ import { attachTip } from '../charts';
|
||||
import { peopleUrl } from '../urls';
|
||||
import { daysTile, eventRow, eventText, speedTile } from './overview';
|
||||
import { stateBadge } from './people';
|
||||
import { circleDialog, circleDot, homeAccess } from '../access';
|
||||
|
||||
type Step = 'day' | 'week' | 'month' | 'year' | 'custom';
|
||||
|
||||
@@ -657,9 +658,10 @@ export class PersonPage {
|
||||
seg,
|
||||
E('span', { class: 'dl-sub' }, ACCESS_TEXT[p.access]),
|
||||
p.access === 'lan' && this.st.services.length ? this.servicesPicker() : '',
|
||||
homeAccess(p) ? this.netsPicker() : '',
|
||||
p.access === 'lan' ? this.dnsPicker() : '',
|
||||
]),
|
||||
E('div', { class: 'dl-tiles2' }, [this.devTile(), endTile, dataTile, hoursTile]),
|
||||
E('div', { class: 'dl-tiles2' }, [this.devTile(), this.circleTile(), endTile, dataTile, hoursTile]),
|
||||
]),
|
||||
]),
|
||||
);
|
||||
@@ -720,6 +722,87 @@ export class PersonPage {
|
||||
]);
|
||||
}
|
||||
|
||||
/** Home networks this person reaches, when the server has more than one. */
|
||||
netsPicker(): HTMLElement | '' {
|
||||
const p = this.p;
|
||||
const srv = this.st.servers.find((x) => x.id === p.server);
|
||||
const all = srv?.home ?? [];
|
||||
if (all.length < 2) return '';
|
||||
const picked = new Set(p.home_nets?.length ? p.home_nets : all.map((h) => h.dev));
|
||||
return E('div', { class: 'dl-stack gap4' }, [
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-chips-row' },
|
||||
all.map((h) =>
|
||||
E(
|
||||
'button',
|
||||
{
|
||||
type: 'button',
|
||||
class: `dl-chipbtn${picked.has(h.dev) ? ' on' : ''}`,
|
||||
'aria-pressed': picked.has(h.dev) ? 'true' : 'false',
|
||||
title: h.nets.join(', '),
|
||||
click: () => {
|
||||
const next = new Set(picked);
|
||||
if (!next.delete(h.dev)) next.add(h.dev);
|
||||
if (!next.size) return notify('Keep at least one network, or choose Internet only.', 'warning', 5000);
|
||||
const list = next.size === all.length ? [] : [...next];
|
||||
this.patch(
|
||||
{ home_nets: list },
|
||||
list.length ? `${p.name} reaches ${list.join(', ')}` : `${p.name} reaches every home network`,
|
||||
);
|
||||
},
|
||||
},
|
||||
h.dev,
|
||||
),
|
||||
),
|
||||
),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
p.home_nets?.length
|
||||
? `Home networks ${p.name} reaches. Networks added to the server later stay out.`
|
||||
: `Home networks ${p.name} reaches: all of them. Untick one to keep ${p.name} out of it.`,
|
||||
),
|
||||
]);
|
||||
}
|
||||
|
||||
/** The circle this person's devices share (servers where devices reach each other in circles). */
|
||||
circleTile(): HTMLElement | '' {
|
||||
const p = this.p;
|
||||
const srv = this.st.servers.find((x) => x.id === p.server);
|
||||
if (srv?.mesh !== 'circles' || !homeAccess(p)) return '';
|
||||
const circles = this.st.circles.filter((c) => c.server === p.server);
|
||||
const ci = circles.find((c) => c.id === p.circle);
|
||||
const mates = ci ? this.st.people.filter((x) => x.id !== p.id && x.circle === ci.id && homeAccess(x)).map((x) => x.name) : [];
|
||||
const change: HTMLElement = button('Change', () =>
|
||||
dropdown(change, [
|
||||
...circles.map((c) => ({
|
||||
label: c.name,
|
||||
icon: circleDot(c),
|
||||
run: () => c.id !== p.circle && this.patch({ circle: c.id }, `${p.name} is in ${c.name}`),
|
||||
})),
|
||||
p.circle ? { label: 'No circle', icon: icon('x'), run: () => this.patch({ circle: '' }, `${p.name} is in no circle`) } : null,
|
||||
{ label: 'New circle', icon: icon('plus'), run: () => circleDialog(this.st, p.server, null, () => this.refresh()) },
|
||||
]),
|
||||
);
|
||||
return E('div', { class: 'dl-tile2' }, [
|
||||
E('span', { class: 'dl-tile2-label' }, ['Devices see each other', E('span', { class: 'dl-faint dl-w400' }, 'circle')]),
|
||||
E('div', { class: 'dl-tile2-row' }, [
|
||||
E('span', { class: 'dl-circle-name' }, ci ? [circleDot(ci), ci.name] : E('span', { class: 'dl-muted' }, 'No circle')),
|
||||
change,
|
||||
]),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
!ci
|
||||
? `Only ${p.name}'s own devices see each other.`
|
||||
: mates.length
|
||||
? `${p.name}'s devices and ${mates.join(', ')}'s see each other. Others don't.`
|
||||
: `Nobody else in ${ci.name} yet: only ${p.name}'s own devices see each other.`,
|
||||
),
|
||||
]);
|
||||
}
|
||||
|
||||
/** Optional narrowing of home-network access to selected services. */
|
||||
servicesPicker(): HTMLElement {
|
||||
const chosen = new Set(this.p.services ?? []);
|
||||
|
||||
@@ -9,7 +9,8 @@ import { api, type SetupDefaults } from '../api';
|
||||
import { attempt, button, callout, closeModal, confirmDialog, copyText, modal, notify } from '../ui';
|
||||
import { icon } from '../../shared/icons';
|
||||
import { duration } from '../../shared/format';
|
||||
import { interfacesCard } from '../interfaces';
|
||||
import { accessCards } from '../interfaces';
|
||||
import { checkAccess, whoReaches } from '../access';
|
||||
import { card, group, input, row, sw } from '../kit';
|
||||
import { methodInfo, methodPicker, type Method } from '../disguise';
|
||||
import { ServerOverview } from './overview';
|
||||
@@ -426,48 +427,12 @@ export class ServerPage {
|
||||
);
|
||||
}
|
||||
|
||||
/** Where devices may go and how their traffic leaves: internet path, WAN, home network, services. */
|
||||
/** Where devices may go and how their traffic leaves: internet path, home network, services, circles. */
|
||||
access(srv: Server): HTMLElement {
|
||||
const svcs = this.st.services;
|
||||
const reload = () => this.refresh();
|
||||
return E('div', { class: 'dl-stack gap16' }, [
|
||||
interfacesCard(srv.id, 'Access'),
|
||||
card(
|
||||
'Home services',
|
||||
[
|
||||
E(
|
||||
'p',
|
||||
{ class: 'dl-muted' },
|
||||
'People with Home-only access can be limited to these services instead of the whole home network (chosen per person). The list is shared by all servers.',
|
||||
),
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-list' },
|
||||
svcs.length
|
||||
? svcs.map((sv) =>
|
||||
E('div', { class: 'dl-row' }, [
|
||||
icon('home'),
|
||||
E('span', { class: 'dl-row-main dl-stack' }, [
|
||||
E('b', {}, sv.name),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-mono dl-faint' },
|
||||
`${sv.address}${sv.ports.length ? ` · ports ${sv.ports.join(', ')}` : ' · all ports'}`,
|
||||
),
|
||||
]),
|
||||
]),
|
||||
)
|
||||
: [E('div', { class: 'dl-row dl-muted' }, 'No services yet.')],
|
||||
),
|
||||
],
|
||||
[
|
||||
E('span'),
|
||||
E(
|
||||
'a',
|
||||
{ class: 'cbi-button cbi-button-neutral', href: `${L.url('admin/network/dawnline/settings')}#dl-set-services` },
|
||||
'Edit in Settings',
|
||||
),
|
||||
],
|
||||
),
|
||||
accessCards(srv, this.st, reload),
|
||||
E('div', { class: 'dl-health-cols' }, [whoReaches(this.st, srv), checkAccess(this.st, srv)]),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { E } from '../e';
|
||||
import { api, type Backup, type SettingsData } from '../api';
|
||||
import { attempt, button, closeModal, confirmDialog, modal } from '../ui';
|
||||
import { attempt, button, closeModal, modal } from '../ui';
|
||||
import { icon } from '../../shared/icons';
|
||||
import { group, input, isOn, row, sw } from '../kit';
|
||||
import { CATEGORIES, CATEGORY_HELP, CATEGORY_LABEL, clearLogDialog, exportEvents, resetUsageDialog } from '../logs';
|
||||
@@ -525,43 +525,6 @@ export class SettingsPage {
|
||||
|
||||
const logs = this.logsSection();
|
||||
|
||||
// Home services
|
||||
const svcRows = this.d.services.map((sv) =>
|
||||
E('div', { class: 'dl-row' }, [
|
||||
icon('home'),
|
||||
E('span', { class: 'dl-row-main dl-stack' }, [
|
||||
E('b', {}, sv.name),
|
||||
E('span', { class: 'dl-mono dl-faint' }, `${sv.address}${sv.ports.length ? ` · ports ${sv.ports.join(', ')}` : ' · all ports'}`),
|
||||
]),
|
||||
button('Edit', () => this.editService(sv)),
|
||||
button(
|
||||
[icon('trash')],
|
||||
async () => {
|
||||
if (
|
||||
(await confirmDialog(`Remove ${sv.name}?`, 'People limited to this service lose access to it.', 'Remove', true)) &&
|
||||
(await attempt(() => api.serviceDelete(sv.id), 'Removed'))
|
||||
)
|
||||
this.reload();
|
||||
},
|
||||
'negative',
|
||||
{ title: 'Remove' },
|
||||
),
|
||||
]),
|
||||
);
|
||||
const services = this.section(
|
||||
'services',
|
||||
'Home services',
|
||||
[
|
||||
E(
|
||||
'p',
|
||||
{ class: 'dl-muted' },
|
||||
'Give people with home-network access only specific services instead of the whole network (choose them per person).',
|
||||
),
|
||||
E('div', { class: 'dl-list' }, svcRows.length ? svcRows : [E('div', { class: 'dl-row dl-muted' }, 'No services yet.')]),
|
||||
],
|
||||
[E('span'), button([icon('plus'), ' Add service'], () => this.editService(null), 'add')],
|
||||
);
|
||||
|
||||
const danger = this.section(
|
||||
'danger',
|
||||
'Remove Dawnline from this router',
|
||||
@@ -580,7 +543,7 @@ export class SettingsPage {
|
||||
this.reload();
|
||||
this.loadBackups();
|
||||
});
|
||||
dom.content(this.root, [portal, defaults, map, logs, services, backups, danger]);
|
||||
dom.content(this.root, [portal, defaults, map, logs, backups, danger]);
|
||||
}
|
||||
|
||||
logsSection(): HTMLElement {
|
||||
@@ -771,41 +734,6 @@ export class SettingsPage {
|
||||
}
|
||||
}
|
||||
|
||||
editService(sv: SettingsData['services'][number] | null) {
|
||||
const name = input(sv?.name ?? '', { placeholder: 'NAS' });
|
||||
const addr = input(sv?.address ?? '', { placeholder: '192.168.1.10' });
|
||||
const ports = input(sv?.ports.join(', ') ?? '', { placeholder: 'All ports, or e.g. 445, 5000' });
|
||||
modal(
|
||||
sv ? `Edit ${sv.name}` : 'Add service',
|
||||
[
|
||||
E('div', { class: 'cbi-value' }, [E('label', { class: 'cbi-value-title' }, 'Name'), E('div', { class: 'cbi-value-field' }, name)]),
|
||||
E('div', { class: 'cbi-value' }, [
|
||||
E('label', { class: 'cbi-value-title' }, 'Address'),
|
||||
E('div', { class: 'cbi-value-field' }, addr),
|
||||
]),
|
||||
E('div', { class: 'cbi-value' }, [
|
||||
E('label', { class: 'cbi-value-title' }, 'Ports'),
|
||||
E('div', { class: 'cbi-value-field' }, ports),
|
||||
]),
|
||||
],
|
||||
[
|
||||
E('button', { class: 'cbi-button cbi-button-neutral', click: closeModal }, 'Cancel'),
|
||||
' ',
|
||||
button(
|
||||
'Save',
|
||||
async () => {
|
||||
const list = ports.value.split(/[ ,]+/).filter(Boolean);
|
||||
if (await attempt(() => api.serviceSet(sv?.id ?? '', name.value, addr.value, list), 'Saved')) {
|
||||
closeModal();
|
||||
this.reload();
|
||||
}
|
||||
},
|
||||
'positive',
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
uninstall() {
|
||||
const confirmInput = input('', { placeholder: 'remove' });
|
||||
modal(
|
||||
|
||||
@@ -4,7 +4,12 @@
|
||||
import { api, type Needs } from './api';
|
||||
import { attempt, confirmDialog, notify } from './ui';
|
||||
|
||||
const WHAT: Record<keyof Needs, string> = { https: 'HTTPS for the portal', acme: 'ACME certificates', home: 'the home-like link' };
|
||||
const WHAT: Record<keyof Needs, string> = {
|
||||
https: 'HTTPS for the portal',
|
||||
acme: 'ACME certificates',
|
||||
home: 'the home-like link',
|
||||
bonjour: 'Bonjour for home devices',
|
||||
};
|
||||
const WAIT_MS = 5 * 60 * 1000;
|
||||
|
||||
/** Install `names` for `feature`; resolves true when the job finished, then calls `done`. */
|
||||
|
||||
@@ -1072,6 +1072,46 @@ const CSS = `
|
||||
.dl-upd-row > .dl-pill, .dl-upd-row > button, .dl-upd-head > .dl-pill, .dl-upd-head > button { flex: none; }
|
||||
.dl-upd-bad { color: var(--dl-bad); }
|
||||
.dl-upd-job > .dl-log, .dl-upd-job > .alert-message { margin: 0 14px 14px; }
|
||||
|
||||
/* Server → Access: networks as chips, circles, services from home, who reaches what, check access. */
|
||||
.dl-chip.static { cursor: default; } .dl-chip.static:hover { background: var(--dl-soft); }
|
||||
.dl-chip.static .dl-chip-name { font-weight: 500; }
|
||||
.dl-setrow.head .dl-chips-row { margin-top: 8px; }
|
||||
.dl-setrow.head > .dl-lh-main, .dl-setrow.head > .dl-lh-main > .dl-stack { flex: 1 1 auto; min-width: 0; }
|
||||
.dl-setrow.head > .dl-setrow-ctl:empty { display: none; }
|
||||
.dl-setrow.head:has(> .dl-lh-main) { align-items: flex-start; }
|
||||
.dl-setrow.head > .dl-setrow-ctl { align-items: center; min-height: 30px; }
|
||||
.dl-netpick { margin-top: 10px; }
|
||||
.dl-boxrow { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin: 0; padding: 10px 14px; border: 1px solid var(--dl-line); border-radius: 12px; font-size: 13px; cursor: pointer; }
|
||||
.dl-boxrow > .dl-switch { flex: none; }
|
||||
.dl-ifpick { display: flex; flex-direction: column; gap: 12px; padding: 14px; border: 1px solid var(--dl-line); border-radius: 14px; }
|
||||
.dl-iflead-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
|
||||
.dl-host-ports { justify-content: flex-end; }
|
||||
@media (max-width: 760px) { .dl-host-ports { justify-content: flex-start; } }
|
||||
.dl-circle-dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; flex: none; }
|
||||
.dl-circles .dl-chip b { font-weight: 500; }
|
||||
.dl-circle-name { display: inline-flex; align-items: center; gap: 8px; font-size: 14px; font-weight: 500; }
|
||||
.dl-w400 { font-weight: 400; }
|
||||
.dl-swatches { display: flex; flex-wrap: wrap; gap: 8px; }
|
||||
.dl-swatch { all: unset; cursor: pointer; width: 22px; height: 22px; border-radius: 50%; background: var(--sw); box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--dl-fg) 12%, transparent); }
|
||||
.dl-swatch.on { box-shadow: 0 0 0 2px var(--dl-card), 0 0 0 4px var(--sw); }
|
||||
.dl-swatch:focus-visible { outline: 2px solid var(--dl-ring); outline-offset: 3px; }
|
||||
.dl-circle-modal .dl-chipbtn b { margin-left: 6px; font-weight: 500; font-size: 11px; opacity: .6; }
|
||||
.dl-reach td:first-child b { font-weight: 500; }
|
||||
.dl-ev-host { white-space: nowrap; } .dl-ev-host b { font-weight: 500; color: var(--dl-fg); }
|
||||
.dl-reach { font-size: 13px; } .dl-reach th, .dl-reach td { white-space: nowrap; padding-left: 6px; padding-right: 6px; }
|
||||
.dl-reach-wrap { overflow-x: auto; }
|
||||
.dl-yes { display: inline-flex; align-items: center; gap: 4px; color: var(--dl-ok); }
|
||||
.dl-yes .dl-icon-wrap { display: inline-flex; } .dl-yes .dl-icon { width: 14px; height: 14px; }
|
||||
.dl-check-form { display: grid; grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr) auto; align-items: start; gap: 8px; }
|
||||
.dl-check-form > .dl-faint { line-height: 36px; }
|
||||
.dl-check-end { display: flex; flex-direction: column; gap: 6px; min-width: 0; }
|
||||
.dl-check-end > * { width: 100% !important; min-width: 0; }
|
||||
@media (max-width: 560px) { .dl-check-form { grid-template-columns: minmax(0, 1fr); } .dl-check-form > .dl-faint { display: none; } }
|
||||
.dl-verdict { display: flex; align-items: baseline; gap: 10px; padding: 10px 12px; border-radius: 12px; }
|
||||
.dl-verdict b { font-weight: 500; }
|
||||
.dl-verdict.ok { background: var(--dl-ok-wash); } .dl-verdict.ok b { color: var(--dl-ok); }
|
||||
.dl-verdict.bad { background: var(--dl-bad-wash); } .dl-verdict.bad b { color: var(--dl-bad); }
|
||||
`;
|
||||
|
||||
/** A <style> element for the view root (see the note at the top). */
|
||||
|
||||
+23
-1
@@ -61,9 +61,24 @@ export interface Person {
|
||||
links?: string[];
|
||||
note?: string;
|
||||
services?: string[];
|
||||
/** Home networks (interfaces) this person reaches; empty = all; admin only. */
|
||||
home_nets?: string[];
|
||||
/** Circle id on their server (when the server uses circles); admin only. */
|
||||
circle?: string;
|
||||
created?: number;
|
||||
}
|
||||
|
||||
export type MeshMode = 'off' | 'all' | 'circles';
|
||||
|
||||
/** People whose devices reach each other (a server in circles mode). */
|
||||
export interface Circle {
|
||||
id: string;
|
||||
server: string;
|
||||
name: string;
|
||||
/** Index into the circle palette. */
|
||||
color: number;
|
||||
}
|
||||
|
||||
export interface Server {
|
||||
id: string;
|
||||
name: string;
|
||||
@@ -75,8 +90,12 @@ export interface Server {
|
||||
enabled: boolean;
|
||||
/** Internet traffic enters the router from the LAN, like a home device's. */
|
||||
lan_like: boolean;
|
||||
/** Devices of people with home access reach each other through the tunnel. */
|
||||
/** A person's own devices reach each other (mesh is not off). */
|
||||
device_mesh: boolean;
|
||||
/** Devices of different people: never, everyone with home access, or within a circle. */
|
||||
mesh: MeshMode;
|
||||
/** Home networks by interface, for the per-person picker. */
|
||||
home: { dev: string; nets: string[] }[];
|
||||
preset: string;
|
||||
mtu: number;
|
||||
keepalive: number;
|
||||
@@ -115,6 +134,8 @@ export interface LogEvent {
|
||||
pname?: string;
|
||||
dname?: string;
|
||||
dkind?: string;
|
||||
/** Addresses in `detail` that belong to devices at home, with their DHCP names. */
|
||||
hosts?: Record<string, string>;
|
||||
}
|
||||
|
||||
export interface GeoPoint {
|
||||
@@ -168,6 +189,7 @@ export interface Status {
|
||||
servers: Server[];
|
||||
people: Person[];
|
||||
services: { id: string; name: string; address: string; ports: string[] }[];
|
||||
circles: Circle[];
|
||||
totals: { people: number; devices: number; online: number; active: number; today: Pair; month: Pair };
|
||||
series: DayUsage[];
|
||||
events: LogEvent[];
|
||||
|
||||
Reference in new issue
Block a user