Dawnline 0.11.0
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
- Russian translation. The admin pages, the LuCI menu and the router's messages (errors, Health checks, update steps, the service log) come in Russian with the new luci-i18n-dawnline-ru package, released beside the app. LuCI shows it when its language is Russian, or "auto" with a Russian browser - The translation installs with install.sh when LuCI is in Russian (or with --lang ru), follows every Dawnline update and rollback, and can be added or removed in Components → Dawnline → Translation - The portal speaks the visitor's language: it opens in the system's language and switches between English and Russian in place, from the language pill beside its QR code. It carries its own translation and needs no package - Set-up steps quote the apps' own menus word for word, in Russian too: AmneziaVPN is "+ → Insert → Continue" (it has no "Add server"), and the Mac and Windows menus of WireGuard and AmneziaWG have their real names - Questions in the portal (Reconnect, Remove) read from the left edge and close with Cancel, without × - Numbers, sizes and dates follow the page's language. A server that can't start says why in one sentence; event details and service log lines read as whole sentences - README in Russian (README_ru.md). rules/i18n.md: how strings are written and translated; CI checks the catalogs (npm run i18n:check)
This commit is contained in:
1 parent
caed976e63
commit
2f2aaf6c34
173 files changed
+25645
-2823
No files matched your search
@@ -1 +1 @@
|
||||
@font-face{font-family:Geist;src:url(geist-latin-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap;unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+2000-206F,U+20AC,U+2122,U+2190-21FF,U+2212,U+2215}@font-face{font-family:Geist;src:url(geist-cyrillic-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap;unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:Geist Mono;src:url(geist-mono-latin-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap}:root{color-scheme:dark;--bg: #080808;--raised: #121212;--field: #161616;--knob: #232323;--seg: rgba(237, 237, 237, .05);--seg-shadow: none;--line: rgba(255, 255, 255, .06);--text: #ededed;--text-2: #8c8c8a;--text-3: #4f4f4e;--accent: #4eafff;--accent-ink: #ffffff;--accent-soft: rgba(78, 175, 255, .13);--ok: #57d64b;--ok-soft: rgba(87, 214, 75, .14);--warn: #ff8a3d;--bad: #ff5c5c;--bad-soft: rgba(255, 92, 92, .13);--sel-bg: rgba(131, 209, 255, .25);--sel-fg: #64c6ff;--scrim: rgba(8, 8, 8, .8);--line-glass: rgba(255, 255, 255, .07);--pop-shadow: 0 18px 48px -14px rgba(0, 0, 0, .75);--sheet-shadow: 0 24px 64px -16px rgba(0, 0, 0, .6);--bar: rgba(237, 237, 237, .13);--toast: #232323;--toast-fg: #ededed;--qr-bg: #0a0a0a;--gi-a: rgba(255, 255, 255, .58);--gi-b: rgba(255, 255, 255, .14);--gi-rim: rgba(255, 255, 255, .5);--gi-edge: rgba(0, 0, 0, 0);--gi-detail: #ffffff;--t-grey-a: #cfcfcd;--t-grey-b: #5a5a59;--t-blue-a: #a6d9ff;--t-blue-b: #1d84e6;--t-green-a: #a8f29c;--t-green-b: #3aa32c;--t-red-a: #ffadad;--t-red-b: #dc3a3a;--t-orange-a: #ffc08f;--t-orange-b: #ec6a12;--font: Geist, -apple-system, system-ui, "Segoe UI", sans-serif;--mono: "Geist Mono", ui-monospace, "SF Mono", Menlo, monospace;--r-sheet: 36px;--r-card: 28px;--r-row: 20px;--r-field: 16px;--r-tile: 12px;--ease-out: cubic-bezier(.23, 1, .32, 1);--gutter-l: max(16px, env(safe-area-inset-left, 0px));--gutter-r: max(16px, env(safe-area-inset-right, 0px))}@media(prefers-color-scheme:light){:root{color-scheme:light;--bg: #f2f2f1;--raised: #ffffff;--field: #f3f3f2;--knob: #e8e8e7;--seg: #ffffff;--seg-shadow: 0 1px 2px rgba(0, 0, 0, .08), 0 0 0 .5px rgba(0, 0, 0, .05);--line: rgba(0, 0, 0, .07);--text: #0b0b0b;--text-2: #6d6d6b;--text-3: #a6a6a4;--accent: #2b9dff;--accent-soft: rgba(43, 157, 255, .12);--ok: #33a328;--ok-soft: rgba(51, 163, 40, .12);--warn: #ee6a12;--bad: #e5484d;--bad-soft: rgba(229, 72, 77, .1);--sel-bg: rgba(78, 175, 255, .22);--sel-fg: #0a76cf;--scrim: rgba(236, 236, 235, .62);--line-glass: rgba(0, 0, 0, .07);--pop-shadow: 0 18px 44px -14px rgba(0, 0, 0, .2);--sheet-shadow: 0 24px 64px -18px rgba(0, 0, 0, .22);--bar: rgba(11, 11, 11, .11);--toast: #0b0b0b;--toast-fg: #f2f2f1;--qr-bg: #ffffff;--gi-a: rgba(250, 250, 249, .72);--gi-b: rgba(206, 206, 204, .5);--gi-rim: rgba(255, 255, 255, .9);--gi-edge: rgba(0, 0, 0, .11);--gi-detail: rgba(28, 28, 28, .72);--t-grey-a: #a9a9a7;--t-grey-b: #3d3d3c;--t-blue-a: #7cc4ff;--t-blue-b: #0a6fd6;--t-green-a: #82e070;--t-green-b: #2e8a22;--t-red-a: #ff9090;--t-red-b: #c92a2a}}*{box-sizing:border-box}html{-webkit-text-size-adjust:100%;scrollbar-gutter:stable}body{margin:0;background:var(--bg);color:var(--text);font:400 15px/22px var(--font);letter-spacing:-.011em;-webkit-font-smoothing:antialiased;min-height:100vh;min-height:100dvh;cursor:default}body.locked{overflow:hidden}input,textarea,.linkrow .mono,.conf{cursor:text}::selection{background:var(--sel-bg);color:var(--sel-fg)}button{font:inherit;color:inherit;letter-spacing:inherit;background:none;border:0;padding:0;margin:0;cursor:pointer;-webkit-tap-highlight-color:transparent}button:disabled{cursor:default}a{color:inherit;text-decoration:none}:focus{outline:none}:focus-visible{outline:2px solid color-mix(in srgb,var(--accent) 65%,transparent);outline-offset:2px}[hidden]{display:none!important}.offscreen{position:fixed;left:-9999px;top:0;opacity:0}.mono{font-family:var(--mono);letter-spacing:0}.num{font-variant-numeric:tabular-nums}.ok-t{color:var(--ok)}.warn-t{color:var(--warn)}.bad-t{color:var(--bad)}.here-t{color:var(--accent)}.i{width:18px;height:18px;flex:none}.gi{width:24px;height:24px;flex:none;overflow:visible;--ta: var(--t-grey-a);--tb: var(--t-grey-b)}.gi.t-blue{--ta: var(--t-blue-a);--tb: var(--t-blue-b)}.gi.t-green{--ta: var(--t-green-a);--tb: var(--t-green-b)}.gi.t-red{--ta: var(--t-red-a);--tb: var(--t-red-b)}.gi.t-orange{--ta: var(--t-orange-a);--tb: var(--t-orange-b)}.gi .ta{stop-color:var(--ta)}.gi .tb{stop-color:var(--tb)}.gi .fa{stop-color:var(--gi-a)}.gi .fb{stop-color:var(--gi-b)}.gi .fc{stop-color:var(--ta);stop-opacity:.28}.gi .ge{stroke:var(--gi-edge)}.gi .gr{stroke:var(--gi-rim)}.gi .gd{stroke:var(--gi-detail)}.gi .gdf{color:var(--gi-detail)}.knob{width:32px;height:32px;border-radius:50%;background:var(--knob);color:var(--text);display:grid;place-items:center;flex:none;transition:transform .15s var(--ease-out),background-color .15s}.knob:hover{background:color-miLine truncated
|
||||
@font-face{font-family:Geist;src:url(geist-latin-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap;unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+2000-206F,U+20AC,U+2122,U+2190-21FF,U+2212,U+2215}@font-face{font-family:Geist;src:url(geist-cyrillic-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap;unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:Geist Mono;src:url(geist-mono-latin-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap}:root{color-scheme:dark;--bg: #080808;--raised: #121212;--field: #161616;--knob: #232323;--seg: rgba(237, 237, 237, .05);--seg-shadow: none;--line: rgba(255, 255, 255, .06);--text: #ededed;--text-2: #8c8c8a;--text-3: #4f4f4e;--accent: #4eafff;--accent-ink: #ffffff;--accent-soft: rgba(78, 175, 255, .13);--ok: #57d64b;--ok-soft: rgba(87, 214, 75, .14);--warn: #ff8a3d;--bad: #ff5c5c;--bad-soft: rgba(255, 92, 92, .13);--sel-bg: rgba(131, 209, 255, .25);--sel-fg: #64c6ff;--scrim: rgba(8, 8, 8, .8);--line-glass: rgba(255, 255, 255, .07);--pop-shadow: 0 18px 48px -14px rgba(0, 0, 0, .75);--sheet-shadow: 0 24px 64px -16px rgba(0, 0, 0, .6);--bar: rgba(237, 237, 237, .13);--toast: #232323;--toast-fg: #ededed;--qr-bg: #0a0a0a;--gi-a: rgba(255, 255, 255, .58);--gi-b: rgba(255, 255, 255, .14);--gi-rim: rgba(255, 255, 255, .5);--gi-edge: rgba(0, 0, 0, 0);--gi-detail: #ffffff;--t-grey-a: #cfcfcd;--t-grey-b: #5a5a59;--t-blue-a: #a6d9ff;--t-blue-b: #1d84e6;--t-green-a: #a8f29c;--t-green-b: #3aa32c;--t-red-a: #ffadad;--t-red-b: #dc3a3a;--t-orange-a: #ffc08f;--t-orange-b: #ec6a12;--font: Geist, -apple-system, system-ui, "Segoe UI", sans-serif;--mono: "Geist Mono", ui-monospace, "SF Mono", Menlo, monospace;--r-sheet: 36px;--r-card: 28px;--r-row: 20px;--r-field: 16px;--r-tile: 12px;--ease-out: cubic-bezier(.23, 1, .32, 1);--gutter-l: max(16px, env(safe-area-inset-left, 0px));--gutter-r: max(16px, env(safe-area-inset-right, 0px))}@media(prefers-color-scheme:light){:root{color-scheme:light;--bg: #f2f2f1;--raised: #ffffff;--field: #f3f3f2;--knob: #e8e8e7;--seg: #ffffff;--seg-shadow: 0 1px 2px rgba(0, 0, 0, .08), 0 0 0 .5px rgba(0, 0, 0, .05);--line: rgba(0, 0, 0, .07);--text: #0b0b0b;--text-2: #6d6d6b;--text-3: #a6a6a4;--accent: #2b9dff;--accent-soft: rgba(43, 157, 255, .12);--ok: #33a328;--ok-soft: rgba(51, 163, 40, .12);--warn: #ee6a12;--bad: #e5484d;--bad-soft: rgba(229, 72, 77, .1);--sel-bg: rgba(78, 175, 255, .22);--sel-fg: #0a76cf;--scrim: rgba(236, 236, 235, .62);--line-glass: rgba(0, 0, 0, .07);--pop-shadow: 0 18px 44px -14px rgba(0, 0, 0, .2);--sheet-shadow: 0 24px 64px -18px rgba(0, 0, 0, .22);--bar: rgba(11, 11, 11, .11);--toast: #0b0b0b;--toast-fg: #f2f2f1;--qr-bg: #ffffff;--gi-a: rgba(250, 250, 249, .72);--gi-b: rgba(206, 206, 204, .5);--gi-rim: rgba(255, 255, 255, .9);--gi-edge: rgba(0, 0, 0, .11);--gi-detail: rgba(28, 28, 28, .72);--t-grey-a: #a9a9a7;--t-grey-b: #3d3d3c;--t-blue-a: #7cc4ff;--t-blue-b: #0a6fd6;--t-green-a: #82e070;--t-green-b: #2e8a22;--t-red-a: #ff9090;--t-red-b: #c92a2a}}*{box-sizing:border-box}html{-webkit-text-size-adjust:100%;scrollbar-gutter:stable}body{margin:0;background:var(--bg);color:var(--text);font:400 15px/22px var(--font);letter-spacing:-.011em;-webkit-font-smoothing:antialiased;min-height:100vh;min-height:100dvh;cursor:default}body.locked{overflow:hidden}input,textarea,.linkrow .mono,.conf{cursor:text}::selection{background:var(--sel-bg);color:var(--sel-fg)}button{font:inherit;color:inherit;letter-spacing:inherit;background:none;border:0;padding:0;margin:0;cursor:pointer;-webkit-tap-highlight-color:transparent}button:disabled{cursor:default}a{color:inherit;text-decoration:none}:focus{outline:none}:focus-visible{outline:2px solid color-mix(in srgb,var(--accent) 65%,transparent);outline-offset:2px}[hidden]{display:none!important}.offscreen{position:fixed;left:-9999px;top:0;opacity:0}.mono{font-family:var(--mono);letter-spacing:0}.num{font-variant-numeric:tabular-nums}.ok-t{color:var(--ok)}.warn-t{color:var(--warn)}.bad-t{color:var(--bad)}.here-t{color:var(--accent)}.i{width:18px;height:18px;flex:none}.gi{width:24px;height:24px;flex:none;overflow:visible;--ta: var(--t-grey-a);--tb: var(--t-grey-b)}.gi.t-blue{--ta: var(--t-blue-a);--tb: var(--t-blue-b)}.gi.t-green{--ta: var(--t-green-a);--tb: var(--t-green-b)}.gi.t-red{--ta: var(--t-red-a);--tb: var(--t-red-b)}.gi.t-orange{--ta: var(--t-orange-a);--tb: var(--t-orange-b)}.gi .ta{stop-color:var(--ta)}.gi .tb{stop-color:var(--tb)}.gi .fa{stop-color:var(--gi-a)}.gi .fb{stop-color:var(--gi-b)}.gi .fc{stop-color:var(--ta);stop-opacity:.28}.gi .ge{stroke:var(--gi-edge)}.gi .gr{stroke:var(--gi-rim)}.gi .gd{stroke:var(--gi-detail)}.gi .gdf{color:var(--gi-detail)}.knob{width:32px;height:32px;border-radius:50%;background:var(--knob);color:var(--text);display:grid;place-items:center;flex:none;transition:transform .15s var(--ease-out),background-color .15s}.knob:hover{background:color-miLine truncated
|
||||
@@ -1,6 +1,6 @@
|
||||
"use strict";(()=>{var Oo=Object.create;var On=Object.defineProperty;var Ro=Object.getOwnPropertyDescriptor;var No=Object.getOwnPropertyNames;var Io=Object.getPrototypeOf,Fo=Object.prototype.hasOwnProperty;var Ko=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports);var qo=(t,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of No(e))!Fo.call(t,o)&&o!==n&&On(t,o,{get:()=>e[o],enumerable:!(r=Ro(e,o))||r.enumerable});return t};var Go=(t,e,n)=>(n=t!=null?Oo(Io(t)):{},qo(e||!t||!t.__esModule?On(n,"default",{value:t,enumerable:!0}):n,t));var gr=Ko((hr,mr)=>{"use strict";var fr=(function(){var t=function(d,m){var s=236,h=17,f=d,E=n[m],p=null,l=0,L=null,x=[],C={},R=function(w,k){l=f*4+17,p=(function(y){for(var T=new Array(y),S=0;S<y;S+=1){T[S]=new Array(y);for(var D=0;D<y;D+=1)T[S][D]=null}return T})(l),I(0,0),I(l-7,0),I(0,l-7),et(),Q(),it(w,k),f>=7&&ot(w),L==null&&(L=$t(f,E,x)),G(L,k)},I=function(w,k){for(var y=-1;y<=7;y+=1)if(!(w+y<=-1||l<=w+y))for(var T=-1;T<=7;T+=1)k+T<=-1||l<=k+T||(0<=y&&y<=6&&(T==0||T==6)||0<=T&&T<=6&&(y==0||y==6)||2<=y&&y<=4&&2<=T&&T<=4?p[w+y][k+T]=!0:p[w+y][k+T]=!1)},z=function(){for(var w=0,k=0,y=0;y<8;y+=1){R(!0,y);var T=o.getLostPoint(C);(y==0||w>T)&&(w=T,k=y)}return k},Q=function(){for(var w=8;w<l-8;w+=1)p[w][6]==null&&(p[w][6]=w%2==0);for(var k=8;k<l-8;k+=1)p[6][k]==null&&(p[6][k]=k%2==0)},et=function(){for(var w=o.getPatternPosition(f),k=0;k<w.length;k+=1)for(var y=0;y<w.length;y+=1){var T=w[k],S=w[y];if(p[T][S]==null)for(var D=-2;D<=2;D+=1)for(var K=-2;K<=2;K+=1)D==-2||D==2||K==-2||K==2||D==0&&K==0?p[T+D][S+K]=!0:p[T+D][S+K]=!1}},ot=function(w){for(var k=o.getBCHTypeNumber(f),y=0;y<18;y+=1){var T=!w&&(k>>y&1)==1;p[Math.floor(y/3)][y%3+l-8-3]=T}for(var y=0;y<18;y+=1){var T=!w&&(k>>y&1)==1;p[y%3+l-8-3][Math.floor(y/3)]=T}},it=function(w,k){for(var y=E<<3|k,T=o.getBCHTypeInfo(y),S=0;S<15;S+=1){var D=!w&&(T>>S&1)==1;S<6?p[S][8]=D:S<8?p[S+1][8]=D:p[l-15+S][8]=D}for(var S=0;S<15;S+=1){var D=!w&&(T>>S&1)==1;S<8?p[8][l-S-1]=D:S<9?p[8][15-S-1+1]=D:p[8][15-S-1]=D}p[l-8][8]=!w},G=function(w,k){for(var y=-1,T=l-1,S=7,D=0,K=o.getMaskFunction(k),N=l-1;N>0;N-=2)for(N==6&&(N-=1);;){for(var X=0;X<2;X+=1)if(p[T][N-X]==null){var nt=!1;D<w.length&&(nt=(w[D]>>>S&1)==1);var q=K(T,N-X);q&&(nt=!nt),p[T][N-X]=nt,S-=1,S==-1&&(D+=1,S=7)}if(T+=y,T<0||l<=T){T-=y,y=-y;break}}},V=function(w,k){for(var y=0,T=0,S=0,D=new Array(k.length),K=new Array(k.length),N=0;N<k.length;N+=1){var X=k[N].dataCount,nt=k[N].totalCount-X;T=Math.max(T,X),S=Math.max(S,nt),D[N]=new Array(X);for(var q=0;q<D[N].length;q+=1)D[N][q]=255&w.getBuffer()[q+y];y+=X;var gt=o.getErrorCorrectPolynomial(nt),vt=c(D[N],gt.getLength()-1),Dn=vt.mod(gt);K[N]=new Array(gt.getLength()-1);for(var q=0;q<K[N].length;q+=1){var Bn=q+Dn.getLength()-K[N].length;K[N][q]=Bn>=0?Dn.getAt(Bn):0}}for(var Hn=0,q=0;q<k.length;q+=1)Hn+=k[q].totalCount;for(var on=new Array(Hn),Ae=0,q=0;q<T;q+=1)for(var N=0;N<k.length;N+=1)q<D[N].length&&(on[Ae]=D[N][q],Ae+=1);for(var q=0;q<S;q+=1)for(var N=0;N<k.length;N+=1)q<K[N].length&&(on[Ae]=K[N][q],Ae+=1);return on},$t=function(w,k,y){for(var T=g.getRSBlocks(w,k),S=v(),D=0;D<y.length;D+=1){var K=y[D];S.put(K.getMode(),4),S.put(K.getLength(),o.getLengthInBits(K.getMode(),w)),K.write(S)}for(var N=0,D=0;D<T.length;D+=1)N+=T[D].dataCount;if(S.getLengthInBits()>N*8)throw"code length overflow. ("+S.getLengthInBits()+">"+N*8+")";for(S.getLengthInBits()+4<=N*8&&S.put(0,4);S.getLengthInBits()%8!=0;)S.putBit(!1);for(;!(S.getLengthInBits()>=N*8||(S.put(s,8),S.getLengthInBits()>=N*8));)S.put(h,8);return V(S,T)};C.addData=function(w,k){k=k||"Byte";var y=null;switch(k){case"Numeric":y=u(w);break;case"Alphanumeric":y=M(w);break;case"Byte":y=b(w);break;case"Kanji":y=A(w);break;default:throw"mode:"+k}x.push(y),L=null},C.isDark=function(w,k){if(w<0||l<=w||k<0||l<=k)throw w+","+k;return p[w][k]},C.getModuleCount=function(){return l},C.make=function(){if(f<1){for(var w=1;w<40;w++){for(var k=g.getRSBlocks(w,E),y=v(),T=0;T<x.length;T++){var S=x[T];y.put(S.getMode(),4),y.put(S.getLength(),o.getLengthInBits(S.getMode(),w)),S.write(y)}for(var D=0,T=0;T<k.length;T++)D+=k[T].dataCount;if(y.getLengthInBits()<=D*8)break}f=w}R(!1,z())},C.createTableTag=function(w,k){w=w||2,k=typeof k=="undefined"?w*4:k;var y="";y+='<table style="',y+=" border-width: 0px; border-style: none;",y+=" border-collapse: collapse;",y+=" padding: 0px; margin: "+k+"px;",y+='">',y+="<tbody>";for(var T=0;T<C.getModuleCount();T+=1){y+="<tr>";for(var S=0;S<C.getModuleCount();S+=1)y+='<td style="',y+=" border-width: 0px; border-style: none;",y+=" border-collapse: collapse;",y+=" padding: 0px; margin: 0px;",y+=" width: "+w+"px;",y+=" height: "+w+"px;",y+=" background-color: ",y+=C.isDark(T,S)?"#000000":"#ffffff",y+=";",y+='"/>';y+="</tr>"}return y+="</tbody>",y+="</table>",y},C.createSvgTag=function(w,k,y,T){var S={};typeof arguments[0]=="object"&&(S=arguments[0],w=S.cellSize,k=S.margin,y=S.alt,T=S.title),w=w||2,k=typeof k=="undefined"?w*4:k,y=typeof y=="string"?{text:y}:y||{Line truncated
|
||||
`}return y%2&&w>0?vt.substring(0,vt.length-y-1)+Array(y+1).join("▀"):vt.substring(0,vt.length-1)};return C.createASCII=function(w,k){if(w=w||1,w<2)return rn(k);w-=1,k=typeof k=="undefined"?w*2:k;var y=C.getModuleCount()*w+k*2,T=k,S=y-k,D,K,N,X,nt=Array(w+1).join("██"),q=Array(w+1).join(" "),gt="",vt="";for(D=0;D<y;D+=1){for(N=Math.floor((D-T)/w),vt="",K=0;K<y;K+=1)X=1,T<=K&&K<S&&T<=D&&D<S&&C.isDark(N,Math.floor((K-T)/w))&&(X=0),vt+=X?nt:q;for(N=0;N<w;N+=1)gt+=vt+`
|
||||
`}return gt.substring(0,gt.length-1)},C.renderTo2dContext=function(w,k){k=k||2;for(var y=C.getModuleCount(),T=0;T<y;T++)for(var S=0;S<y;S++)w.fillStyle=C.isDark(T,S)?"black":"white",w.fillRect(T*k,S*k,k,k)},C};t.stringToBytesFuncs={default:function(d){for(var m=[],s=0;s<d.length;s+=1){var h=d.charCodeAt(s);m.push(h&255)}return m}},t.stringToBytes=t.stringToBytesFuncs.default,t.createStringToBytes=function(d,m){var s=(function(){for(var f=P(d),E=function(){var Q=f.read();if(Q==-1)throw"eof";return Q},p=0,l={};;){var L=f.read();if(L==-1)break;var x=E(),C=E(),R=E(),I=String.fromCharCode(L<<8|x),z=C<<8|R;l[I]=z,p+=1}if(p!=m)throw p+" != "+m;return l})(),h=63;return function(f){for(var E=[],p=0;p<f.length;p+=1){var l=f.charCodeAt(p);if(l<128)E.push(l);else{var L=s[f.charAt(p)];typeof L=="number"?(L&255)==L?E.push(L):(E.push(L>>>8),E.push(L&255)):E.push(h)}}return E}};var e={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},n={L:1,M:0,Q:3,H:2},r={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},o=(function(){var d=[[],[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]],m=1335,s=7973,h=21522,f={},E=function(p){for(var l=0;p!=0;)l+=1,p>>>=1;return l};return f.getBCHTypeInfo=function(p){for(var l=p<<10;E(l)-E(m)>=0;)l^=m<<E(l)-E(m);return(p<<10|l)^h},f.getBCHTypeNumber=function(p){for(var l=p<<12;E(l)-E(s)>=0;)l^=s<<E(l)-E(s);return p<<12|l},f.getPatternPosition=function(p){return d[p-1]},f.getMaskFunction=function(p){switch(p){case r.PATTERN000:return function(l,L){return(l+L)%2==0};case r.PATTERN001:return function(l,L){return l%2==0};case r.PATTERN010:return function(l,L){return L%3==0};case r.PATTERN011:return function(l,L){return(l+L)%3==0};case r.PATTERN100:return function(l,L){return(Math.floor(l/2)+Math.floor(L/3))%2==0};case r.PATTERN101:return function(l,L){return l*L%2+l*L%3==0};case r.PATTERN110:return function(l,L){return(l*L%2+l*L%3)%2==0};case r.PATTERN111:return function(l,L){return(l*L%3+(l+L)%2)%2==0};default:throw"bad maskPattern:"+p}},f.getErrorCorrectPolynomial=function(p){for(var l=c([1],0),L=0;L<p;L+=1)l=l.multiply(c([1,a.gexp(L)],0));return l},f.getLengthInBits=function(p,l){if(1<=l&&l<10)switch(p){case e.MODE_NUMBER:return 10;case e.MODE_ALPHA_NUM:return 9;case e.MODE_8BIT_BYTE:return 8;case e.MODE_KANJI:return 8;default:throw"mode:"+p}else if(l<27)switch(p){case e.MODE_NUMBER:return 12;case e.MODE_ALPHA_NUM:return 11;case e.MODE_8BIT_BYTE:return 16;case e.MODE_KANJI:return 10;default:throw"mode:"+p}else if(l<41)switch(p){case e.MODE_NUMBER:return 14;case e.MODE_ALPHA_NUM:return 13;case e.MODE_8BIT_BYTE:return 16;case e.MODE_KANJI:return 12;default:throw"mode:"+p}else throw"type:"+l},f.getLostPoint=function(p){for(var l=p.getModuleCount(),L=0,x=0;x<l;x+=1)for(var C=0;C<l;C+=1){for(var R=0,I=p.isDark(x,C),z=-1;z<=1;z+=1)if(!(x+z<0||l<=x+z))for(var Q=-1;Q<=1;Q+=1)C+Q<0||l<=C+Q||z==0&&Q==0||I==p.isDark(x+z,C+Q)&&(R+=1);R>5&&(L+=3+R-5)}for(var x=0;x<l-1;x+=1)for(var C=0;C<l-1;C+=1){var et=0;p.isDark(x,C)&&(et+=1),p.isDark(x+1,C)&&(et+=1),p.isDark(x,C+1)&&(et+=1),p.isDark(x+1,C+1)&&(et+=1),(et==0||et==4)&&(L+=3)}for(var x=0;x<l;x+=1)for(var C=0;C<l-6;C+=1)p.isDark(x,C)&&!p.isDark(x,C+1)&&p.isDark(x,C+2)&&p.isDark(x,C+3)&&p.isDark(x,C+4)&&!p.isDark(x,C+5)&&p.isDark(x,C+6)&&(L+=40);for(var C=0;C<l;C+=1)for(var x=0;x<l-6;x+=1)p.isDark(x,C)&&!p.isDark(x+1,C)&&p.isDark(x+2,C)&&p.isDark(x+3,C)&&p.isDark(x+4,C)&&!p.isDark(x+5,C)&&p.isDark(x+6,C)&&(L+=40);for(var ot=0,C=0;C<l;C+=1)for(var x=0;x<l;x+=1)p.isDark(x,C)&&(ot+=1);var it=Math.abs(100*ot/l/l-50)/5;return L+=it*10,L},f})(),a=(function(){for(var d=new Array(256),m=new Array(256),s=0;s<8;s+=1)d[s]=1<<s;for(var s=8;s<256;s+=1)d[s]=d[s-4]^d[s-5]^d[s-6]^d[s-8];for(var s=0;s<255;s+=1)m[d[s]]=s;var h={};return h.glog=function(f){if(f<1)throw"glog("+f+")";return m[f]},h.gexp=function(f){for(;f<0;)f+=255;for(;f>=256;)f-=255;return d[f]},h})();function c(d,m){if(typeof d.length=="undefined")throw d.length+"/"+m;var s=(function(){for(var f=0;f<d.length&&d[f]==0;)f+=1;for(var E=new Array(d.length-f+m),p=0;p<d.length-f;p+=1)E[p]=d[p+f];return E})(),h={};return h.getAt=function(f){return s[f]},h.getLength=function(){return s.length},h.multiply=function(f){for(var E=new Array(h.getLength()+f.getLength()-1),p=0;p<h.getLength();p+=1)for(var l=0;l<f.getLength();l+=1)E[p+l]^=a.gexp(a.glog(h.getAt(p))+a.glog(f.getAt(l)));return c(E,0)},h.mod=function(
Line truncated
|
||||
`),hostName:a,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},g={containers:[{container:"amnezia-awg",awg:{isThirdPartyConfig:!0,last_config:JSON.stringify(c),port:String(n.port),protocol_version:r.header_protection_key?"3.1":"2",transport_proto:"udp"}}],defaultContainer:"amnezia-awg",description:e,hostName:a};return n.dns[0]&&(g.dns1=n.dns[0]),n.dns[1]&&(g.dns2=n.dns[1]),g}function bi(t){let e="";for(let n=0;n<t.length;n+=32768)e+=String.fromCharCode(...t.subarray(n,n+32768));return btoa(e).replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,"")}async function wi(t){let e=globalThis;if(typeof e.CompressionStream=="undefined")return null;try{let n=new e.Blob([t]).stream().pipeThrough(new e.CompressionStream("deflate")),r=new Uint8Array(await new e.Response(n).arrayBuffer()),o=new Uint8Array(4+r.length);return new DataView(o.buffer).setUint32(0,t.length,!1),o.set(r,4),o}catch{return null}}async function Ln(t,e,n=!0){let r=new TextEncoder().encode(JSON.stringify(xi(t,e))),o=n?await wi(r):null;return`vpn://${bi(o!=null?o:r)}`}var Zr=t=>t.replace(/^vpn:\/\//,"");var to=["height","marginTop","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"];function qt(t,e={}){let n=i("div",{class:`acc${e.inset?" inset":""}`}),r=t.map((u,M)=>{var $;let b=u.body.filter(d=>!!d),A=!b.length,O=[u.icon,i("span",{class:"acc-title"},i("span",{class:"t"},u.title),($=u.tag)!=null?$:null),u.val?i("span",{class:`acc-val${u.valHide?" hide-open":""}`},u.val):null],B=M===e.open&&!A,P=A?i("div",{class:"acc-head"},...O):i("button",{type:"button",class:"acc-head","aria-expanded":String(B),onclick:()=>v(H)},...O,F("chevron","i acc-chev")),H=i("div",{class:`acc-row${A?" still":""}${B?" open":""}`},P,i("div",{class:"acc-body"},...b));return n.appendChild(H),H}),o=u=>u.querySelector(".acc-body"),a=()=>r.forEach((u,M)=>{let b=u.classList.contains("open");u.classList.toggle("rt",M===0||b||r[M-1].classList.contains("open")),u.classList.toggle("rb",M===r.length-1||b||r[M+1].classList.contains("open"))}),c=u=>{let M=getComputedStyle(u),b={};for(let A of to)b[A]=A==="height"?`${u.getBoundingClientRect().height}px`:M[A];return b},g=()=>r.forEach(u=>{var M;return(M=u.querySelector("button.acc-head"))==null?void 0:M.setAttribute("aria-expanded",String(u.classList.contains("open")))});function v(u){var B;let M=r.map(c);r.forEach(P=>P.getAnimations().forEach(H=>H.cancel())),r.forEach(P=>o(P).getAnimations().forEach(H=>H.cancel()));let b=!u.classList.contains("open"),A=r.filter(P=>P.classList.contains("open")&&(P===u||b));r.forEach(P=>{P.classList.remove("closing"),P!==u&&P.classList.remove("open")}),u.classList.toggle("open",b),a();let O=ce();r.forEach((P,H)=>{let $=c(P);to.some(d=>M[H][d]!==$[d])&&(A.includes(P)&&P.classList.add("closing"),_(P,[M[H],$],{duration:Et.duration,easing:Et.easing}).onfinish=()=>P.classList.remove("closing"))}),A.forEach(P=>_(o(P),[{opacity:1},{opacity:0,filter:"blur(2px)"}],{duration:160,easing:J,fill:"forwards"})),b&&_(o(u),[{opacity:0,filter:"blur(2px)"},{opacity:1,filter:"blur(0px)"}],{duration:300,easing:"cubic-bezier(0,0,.58,1)"}),de(O),g(),(B=e.onToggle)==null||B.call(e,r.indexOf(u),b,!1)}return a(),{el:n,openIndex:()=>r.findIndex(u=>u.classList.contains("open")),setOpen(u){r.forEach((M,b)=>M.classList.toggle("open",b===u&&!M.classList.contains("still"))),a(),g(),r.forEach((M,b)=>{var A;return(A=e.onToggle)==null?void 0:A.call(e,b,M.classList.contains("open"),!0)})}}}function eo(t,e,n){let r=i("span",{class:"seg-pill"}),o=i("div",{class:"seg appseg",role:"tablist"},r),a=t.map(A=>{let O=i("button",{type:"button",class:"seg-b",role:"tab","aria-label":A.label,title:A.label,onclick:()=>b(A.value)},F(A.icon),i("span",{class:"seg-l"},A.label));return O.dataset.v=A.value,o.appendChild(O),O}),c=A=>A.querySelector(".seg-l"),g=()=>a.forEach(A=>{let O=A.dataset.v===e;A.classList.toggle("on",O),A.setAttribute("aria-selected",String(O))}),v=()=>{let A=a.find(O=>O.dataset.v===e);return A&&A.offsetWidth?[A.offsetLeft,o.clientWidth-A.offsetLeft-A.offsetWidth]:null},u=()=>{let A=v();A&&(r.style.left=`${A[0]}px`,r.style.right=`${A[1]}px`)},M=0;function b(A){if(A===e)return;let O=a.findIndex(C=>C.dataset.v===e),B=a.findIndex(C=>C.dataset.v===A),P=getComputedStyle(r),H=parseFloat(P.left)||0,$=parseFloat(P.right)||0,d=a.map(C=>parseFloat(getComputedStyle(C).flexGrow)||0),m=c(a[O]),s=m.getBoundingClientRect().width;[...a,...a.map(c)].forEach(C=>C.getAnimations().forEach(R=>R.cancel())),e=A,g(),a.forEach((C,R)=>{let I=R===B?1:0;d[R]!==I&&_(C,[{flexGrow:d[R]},{flexGrow:I}],{duration:U.duration,easing:U.easing})}),_(m,[{opacity:1,maxWidth:`${s}px`,marginLeft:"0px"},{opacity:0,maxWidth:"0px",marginLeft:"-8px"}],{duration:220,easing:"ease-out"}),_(c(a[B]),[{opacity:0,filter:"blur(4px)"},{opacity:1,filter:"none"}],{duration:280,delay:70,easing:Y,fill:"backwards"});let h=B>O,f=Lt()?U:Fn,E=performance.now(),p=Math.m
Line truncated
|
||||
`).flatMap((u,M)=>M?[`
|
||||
`,ro(u,e)]:[ro(u,e)]));r();let o=!!Wt(t.filename,t.conf),a=i("button",{type:"button",class:"btn soft sm",onclick:()=>{e=!e,a.replaceChildren(F(e?"x":"key"),i("span",{},e?"Hide key":"Show key")),r(),n.querySelectorAll(".mask, .k").forEach(u=>_(u,[{filter:"blur(4px)",opacity:.4},{filter:"none",opacity:1}],{duration:320,easing:Y}))}},F("key"),i("span",{},"Show key")),c=i("button",{type:"button",class:"btn soft sm",onclick:u=>pt(t.conf,"Configuration copied",u.currentTarget)},F("copy"),i("span",{class:"lbl"},"Copy")),g=i("div",{class:"filecard"},i("div",{class:"fc-row"},i("span",{class:"filecard-ic"},".conf"),i("span",{class:"t"},i("span",{class:"mono"},t.filename),i("span",{},"For computers and routers"))),i("button",{type:"button",class:"btn accent sm block",onclick:()=>ye(t.filename,t.conf)},F(o?"open":"download"),i("span",{},o?"Share file":"Download"))),v=qt([{icon:j("file"),title:"Configuration",body:[i("div",{class:"confbar"},a,c),n]}],{inset:!0});return i("div",{class:"step-box"},g,v.el)}function fo(t){let e=i("span",{class:"osm-p"},at[t]),n=Dr(me(t,"ios"),me(t,"android"));return{el:i("span",{class:"scanline"},i("span",{},"In ",e,":"),n.el),set(r){Z(e,at[r],void 0,{whole:!0}),n.set(me(r,"ios"),me(r,"android"))}}}function ho(t){let e=i("span",{class:"tt"}),n=i("span",{class:"tt-m"}),r=i("span",{class:"hp-tip","aria-hidden":"true"},e,n),o=i("button",{type:"button",class:"hp-b",onclick:()=>ye(t().file,t().text)},F("download")),a=i("button",{type:"button",class:"hp-b"},F("copy")),c=i("div",{class:"hpill",role:"group","aria-label":"The connection","data-key":"conn"},o,a,r),g=null,v=0,u=0,M=s=>{var h;return s===a&&a.classList.contains("done")?"Copied":(h=s.getAttribute("aria-label"))!=null?h:""},b=(s,h)=>{n.textContent=h;let f=n.offsetWidth+20;return Math.min(s.offsetLeft+s.offsetWidth/2,c.offsetWidth+46-f/2)},A=s=>`translateX(${s}px) translateX(-50%)`,O=s=>{let h=getComputedStyle(r).transform;r.getAnimations().forEach(f=>f.cancel()),r.style.transform=A(s),_(r,[{transform:h},{transform:A(s)}],{duration:U.duration,easing:U.easing})},B=s=>Z(e,s),P=s=>{if(clearTimeout(v),g===s&&r.classList.contains("on"))return;if(g=s,r.classList.contains("on")){let f=M(s);return O(b(s,f)),B(f)}let h=()=>{let f=M(s);bt(e,f);let E=b(s,f);r.getAnimations().forEach(p=>p.cancel()),r.style.transform=A(E),r.classList.add("on"),_(r,[{opacity:0,transform:`${A(E)} translateY(-3px) scale(.96)`,filter:"blur(3px)"},{opacity:1,transform:A(E),filter:"blur(0px)"}],{duration:220,easing:Y})};performance.now()<u?h():v=window.setTimeout(h,420)},H=()=>{clearTimeout(v),g=null,r.classList.contains("on")&&(u=performance.now()+500,r.classList.remove("on"),_(r,[{opacity:1},{opacity:0}],{duration:120,easing:"ease-out"}))};for(let s of[o,a])s.addEventListener("pointerenter",h=>{h.pointerType==="mouse"&&P(s)}),s.addEventListener("focus",()=>{s.matches(":focus-visible")&&P(s)}),s.addEventListener("blur",H);c.addEventListener("pointerleave",H);let $=s=>{let h=F(s);a.querySelector("svg").replaceWith(h),_(h,[{opacity:0,transform:"scale(.6)",filter:"blur(3px)"},{opacity:1,transform:"none",filter:"none"}],{duration:yt.duration,easing:yt.easing})},d=()=>{if(g!==a||!r.classList.contains("on"))return;let s=M(a);O(b(a,s)),B(s)},m=0;return a.addEventListener("click",()=>{let s=t();pt(s.text,s.msg),clearTimeout(m),a.classList.contains("done")||(a.classList.add("done"),$("check"),d()),m=window.setTimeout(()=>{a.classList.remove("done"),$("copy"),d()},1600)}),{el:c,sync(){let s=t().app;o.setAttribute("aria-label",`Download ${s} config`),a.setAttribute("aria-label",`Copy ${s} config`)}}}function go(t){let e=i("b",{},"Waiting for the connection"),n=i("span",{class:"ws",hidden:!0}),r=i("div",{class:"way",role:"status","aria-live":"polite"},i("div",{class:"way-row"},i("span",{class:"way-end"},F(t.kind)),i("span",{class:"way-track"},i("span",{class:"way-glow"},i("i")),i("span",{class:"way-fill"})),i("span",{class:"way-end home"},F("server"))),i("div",{class:"way-text"},i("span",{class:"t"},e,n)));return{el:r,connected(){r.classList.add("done"),Z(e,`${t.name} connected`)},gaveUp(){r.classList.add("stopped"),Z(e,"No connection yet"),n.textContent="Close this and open it again to keep checking.",n.hidden=!1,_(e.parentElement,[{opacity:0,filter:"blur(4px)"},{opacity:1,filter:"none"}],{duration:280,easing:Y})}}}function vo(t,e=4){window.setTimeout(async()=>{var n;try{let r=await ut("state");xt(r),be()||Mt(),!((n=r.person.devices.find(o=>o.id===t))!=null&&n.online)&&e>1&&vo(t,e-1)}catch{}},1500)}function yo(t,e,n){let r=te(),o=0,a=0,c=!1,g=Date.now(),v=async()=>{if(o=0,!c){if(Date.now()-g>6e5){c=!0,n();return}if(document.hidden)return u();try{let b=await ut("state");xt(b);let A=b.person.devices.find(O=>O.id===t.id);if(A&&A.handshake>r){c=!0,e(),A.online||vo(t.id);return}}catch(b){if(Oe(b)){c=!0;return}}a++,u()}},u=()=>{!c&&!o&&(o=window.setTimeout(v,a<6?5e3:a<12?15e3:3e4))},M=()=>{!document.hidden&&!c&&!o&&v()};return document.addEventListener("visibilitychange",M),u(),()=>{c=!0,o
Line truncated
|
||||
"use strict";(()=>{var li=Object.create;var tr=Object.defineProperty;var ci=Object.getOwnPropertyDescriptor;var di=Object.getOwnPropertyNames;var ui=Object.getPrototypeOf,pi=Object.prototype.hasOwnProperty;var fi=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var hi=(e,t,n,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of di(t))!pi.call(e,o)&&o!==n&&tr(e,o,{get:()=>t[o],enumerable:!(r=ci(t,o))||r.enumerable});return e};var mi=(e,t,n)=>(n=e!=null?li(ui(e)):{},hi(t||!e||!e.__esModule?tr(n,"default",{value:e,enumerable:!0}):n,e));var Ur=fi((zr,Kr)=>{"use strict";var Wr=(function(){var e=function(d,v){var a=236,h=17,p=d,A=n[v],u=null,l=0,E=null,x=[],C={},I=function(w,k){l=p*4+17,u=(function(y){for(var L=new Array(y),S=0;S<y;S+=1){L[S]=new Array(y);for(var H=0;H<y;H+=1)L[S][H]=null}return L})(l),G(0,0),G(l-7,0),G(0,l-7),re(),J(),ue(w,k),p>=7&&le(w),E==null&&(E=ie(p,A,x)),Y(E,k)},G=function(w,k){for(var y=-1;y<=7;y+=1)if(!(w+y<=-1||l<=w+y))for(var L=-1;L<=7;L+=1)k+L<=-1||l<=k+L||(0<=y&&y<=6&&(L==0||L==6)||0<=L&&L<=6&&(y==0||y==6)||2<=y&&y<=4&&2<=L&&L<=4?u[w+y][k+L]=!0:u[w+y][k+L]=!1)},V=function(){for(var w=0,k=0,y=0;y<8;y+=1){I(!0,y);var L=o.getLostPoint(C);(y==0||w>L)&&(w=L,k=y)}return k},J=function(){for(var w=8;w<l-8;w+=1)u[w][6]==null&&(u[w][6]=w%2==0);for(var k=8;k<l-8;k+=1)u[6][k]==null&&(u[6][k]=k%2==0)},re=function(){for(var w=o.getPatternPosition(p),k=0;k<w.length;k+=1)for(var y=0;y<w.length;y+=1){var L=w[k],S=w[y];if(u[L][S]==null)for(var H=-2;H<=2;H+=1)for(var K=-2;K<=2;K+=1)H==-2||H==2||K==-2||K==2||H==0&&K==0?u[L+H][S+K]=!0:u[L+H][S+K]=!1}},le=function(w){for(var k=o.getBCHTypeNumber(p),y=0;y<18;y+=1){var L=!w&&(k>>y&1)==1;u[Math.floor(y/3)][y%3+l-8-3]=L}for(var y=0;y<18;y+=1){var L=!w&&(k>>y&1)==1;u[y%3+l-8-3][Math.floor(y/3)]=L}},ue=function(w,k){for(var y=A<<3|k,L=o.getBCHTypeInfo(y),S=0;S<15;S+=1){var H=!w&&(L>>S&1)==1;S<6?u[S][8]=H:S<8?u[S+1][8]=H:u[l-15+S][8]=H}for(var S=0;S<15;S+=1){var H=!w&&(L>>S&1)==1;S<8?u[8][l-S-1]=H:S<9?u[8][15-S-1+1]=H:u[8][15-S-1]=H}u[l-8][8]=!w},Y=function(w,k){for(var y=-1,L=l-1,S=7,H=0,K=o.getMaskFunction(k),W=l-1;W>0;W-=2)for(W==6&&(W-=1);;){for(var X=0;X<2;X+=1)if(u[L][W-X]==null){var se=!1;H<w.length&&(se=(w[H]>>>S&1)==1);var U=K(L,W-X);U&&(se=!se),u[L][W-X]=se,S-=1,S==-1&&(H+=1,S=7)}if(L+=y,L<0||l<=L){L-=y,y=-y;break}}},ee=function(w,k){for(var y=0,L=0,S=0,H=new Array(k.length),K=new Array(k.length),W=0;W<k.length;W+=1){var X=k[W].dataCount,se=k[W].totalCount-X;L=Math.max(L,X),S=Math.max(S,se),H[W]=new Array(X);for(var U=0;U<H[W].length;U+=1)H[W][U]=255&w.getBuffer()[U+y];y+=X;var ye=o.getErrorCorrectPolynomial(se),be=c(H[W],ye.getLength()-1),Xn=be.mod(ye);K[W]=new Array(ye.getLength()-1);for(var U=0;U<K[W].length;U+=1){var Zn=U+Xn.getLength()-K[W].length;K[W][U]=Zn>=0?Xn.getAt(Zn):0}}for(var er=0,U=0;U<k.length;U+=1)er+=k[U].totalCount;for(var bn=new Array(er),Nt=0,U=0;U<L;U+=1)for(var W=0;W<k.length;W+=1)U<H[W].length&&(bn[Nt]=H[W][U],Nt+=1);for(var U=0;U<S;U+=1)for(var W=0;W<k.length;W+=1)U<K[W].length&&(bn[Nt]=K[W][U],Nt+=1);return bn},ie=function(w,k,y){for(var L=m.getRSBlocks(w,k),S=g(),H=0;H<y.length;H+=1){var K=y[H];S.put(K.getMode(),4),S.put(K.getLength(),o.getLengthInBits(K.getMode(),w)),K.write(S)}for(var W=0,H=0;H<L.length;H+=1)W+=L[H].dataCount;if(S.getLengthInBits()>W*8)throw"code length overflow. ("+S.getLengthInBits()+">"+W*8+")";for(S.getLengthInBits()+4<=W*8&&S.put(0,4);S.getLengthInBits()%8!=0;)S.putBit(!1);for(;!(S.getLengthInBits()>=W*8||(S.put(a,8),S.getLengthInBits()>=W*8));)S.put(h,8);return ee(S,L)};C.addData=function(w,k){k=k||"Byte";var y=null;switch(k){case"Numeric":y=f(w);break;case"Alphanumeric":y=T(w);break;case"Byte":y=M(w);break;case"Kanji":y=b(w);break;default:throw"mode:"+k}x.push(y),E=null},C.isDark=function(w,k){if(w<0||l<=w||k<0||l<=k)throw w+","+k;return u[w][k]},C.getModuleCount=function(){return l},C.make=function(){if(p<1){for(var w=1;w<40;w++){for(var k=m.getRSBlocks(w,A),y=g(),L=0;L<x.length;L++){var S=x[L];y.put(S.getMode(),4),y.put(S.getLength(),o.getLengthInBits(S.getMode(),w)),S.write(y)}for(var H=0,L=0;L<k.length;L++)H+=k[L].dataCount;if(y.getLengthInBits()<=H*8)break}p=w}I(!1,V())},C.createTableTag=function(w,k){w=w||2,k=typeof k=="undefined"?w*4:k;var y="";y+='<table style="',y+=" border-width: 0px; border-style: none;",y+=" border-collapse: collapse;",y+=" padding: 0px; margin: "+k+"px;",y+='">',y+="<tbody>";for(var L=0;L<C.getModuleCount();L+=1){y+="<tr>";for(var S=0;S<C.getModuleCount();S+=1)y+='<td style="',y+=" border-width: 0px; border-style: none;",y+=" border-collapse: collapse;",y+=" padding: 0px; margin: 0px;",y+=" width: "+w+"px;",y+=" height: "+w+"px;",y+=" background-color: ",y+=C.isDark(L,S)?"#000000":"#ffffff",y+=";",y+='"/>';y+="</tr>"}return y+="</tbody>",y+="</table>",y},C.createSvgTag=function(w,k,y,L){var S={};typeof arguments[0]=="object"&&(S=arguments[0],w=S.cellSize,k=S.margin,y=S.alt,L=S.title),w=w||2,k=typeof k=="undefined"?w*4:k,y=typeof y=="string"?{text:y}:y|Line truncated
|
||||
`}return y%2&&w>0?be.substring(0,be.length-y-1)+Array(y+1).join("▀"):be.substring(0,be.length-1)};return C.createASCII=function(w,k){if(w=w||1,w<2)return Bt(k);w-=1,k=typeof k=="undefined"?w*2:k;var y=C.getModuleCount()*w+k*2,L=k,S=y-k,H,K,W,X,se=Array(w+1).join("██"),U=Array(w+1).join(" "),ye="",be="";for(H=0;H<y;H+=1){for(W=Math.floor((H-L)/w),be="",K=0;K<y;K+=1)X=1,L<=K&&K<S&&L<=H&&H<S&&C.isDark(W,Math.floor((K-L)/w))&&(X=0),be+=X?se:U;for(W=0;W<w;W+=1)ye+=be+`
|
||||
`}return ye.substring(0,ye.length-1)},C.renderTo2dContext=function(w,k){k=k||2;for(var y=C.getModuleCount(),L=0;L<y;L++)for(var S=0;S<y;S++)w.fillStyle=C.isDark(L,S)?"black":"white",w.fillRect(L*k,S*k,k,k)},C};e.stringToBytesFuncs={default:function(d){for(var v=[],a=0;a<d.length;a+=1){var h=d.charCodeAt(a);v.push(h&255)}return v}},e.stringToBytes=e.stringToBytesFuncs.default,e.createStringToBytes=function(d,v){var a=(function(){for(var p=D(d),A=function(){var J=p.read();if(J==-1)throw"eof";return J},u=0,l={};;){var E=p.read();if(E==-1)break;var x=A(),C=A(),I=A(),G=String.fromCharCode(E<<8|x),V=C<<8|I;l[G]=V,u+=1}if(u!=v)throw u+" != "+v;return l})(),h=63;return function(p){for(var A=[],u=0;u<p.length;u+=1){var l=p.charCodeAt(u);if(l<128)A.push(l);else{var E=a[p.charAt(u)];typeof E=="number"?(E&255)==E?A.push(E):(A.push(E>>>8),A.push(E&255)):A.push(h)}}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},r={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},o=(function(){var d=[[],[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]],v=1335,a=7973,h=21522,p={},A=function(u){for(var l=0;u!=0;)l+=1,u>>>=1;return l};return p.getBCHTypeInfo=function(u){for(var l=u<<10;A(l)-A(v)>=0;)l^=v<<A(l)-A(v);return(u<<10|l)^h},p.getBCHTypeNumber=function(u){for(var l=u<<12;A(l)-A(a)>=0;)l^=a<<A(l)-A(a);return u<<12|l},p.getPatternPosition=function(u){return d[u-1]},p.getMaskFunction=function(u){switch(u){case r.PATTERN000:return function(l,E){return(l+E)%2==0};case r.PATTERN001:return function(l,E){return l%2==0};case r.PATTERN010:return function(l,E){return E%3==0};case r.PATTERN011:return function(l,E){return(l+E)%3==0};case r.PATTERN100:return function(l,E){return(Math.floor(l/2)+Math.floor(E/3))%2==0};case r.PATTERN101:return function(l,E){return l*E%2+l*E%3==0};case r.PATTERN110:return function(l,E){return(l*E%2+l*E%3)%2==0};case r.PATTERN111:return function(l,E){return(l*E%3+(l+E)%2)%2==0};default:throw"bad maskPattern:"+u}},p.getErrorCorrectPolynomial=function(u){for(var l=c([1],0),E=0;E<u;E+=1)l=l.multiply(c([1,s.gexp(E)],0));return l},p.getLengthInBits=function(u,l){if(1<=l&&l<10)switch(u){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:"+u}else if(l<27)switch(u){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:"+u}else if(l<41)switch(u){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:"+u}else throw"type:"+l},p.getLostPoint=function(u){for(var l=u.getModuleCount(),E=0,x=0;x<l;x+=1)for(var C=0;C<l;C+=1){for(var I=0,G=u.isDark(x,C),V=-1;V<=1;V+=1)if(!(x+V<0||l<=x+V))for(var J=-1;J<=1;J+=1)C+J<0||l<=C+J||V==0&&J==0||G==u.isDark(x+V,C+J)&&(I+=1);I>5&&(E+=3+I-5)}for(var x=0;x<l-1;x+=1)for(var C=0;C<l-1;C+=1){var re=0;u.isDark(x,C)&&(re+=1),u.isDark(x+1,C)&&(re+=1),u.isDark(x,C+1)&&(re+=1),u.isDark(x+1,C+1)&&(re+=1),(re==0||re==4)&&(E+=3)}for(var x=0;x<l;x+=1)for(var C=0;C<l-6;C+=1)u.isDark(x,C)&&!u.isDark(x,C+1)&&u.isDark(x,C+2)&&u.isDark(x,C+3)&&u.isDark(x,C+4)&&!u.isDark(x,C+5)&&u.isDark(x,C+6)&&(E+=40);for(var C=0;C<l;C+=1)for(var x=0;x<l-6;x+=1)u.isDark(x,C)&&!u.isDark(x+1,C)&&u.isDark(x+2,C)&&u.isDark(x+3,C)&&u.isDark(x+4,C)&&!u.isDark(x+5,C)&&u.isDark(x+6,C)&&(E+=40);for(var le=0,C=0;C<l;C+=1)for(var x=0;x<l;x+=1)u.isDark(x,C)&&(le+=1);var ue=Math.abs(100*le/l/l-50)/5;return E+=ue*10,E},p})(),s=(function(){for(var d=new Array(256),v=new Array(256),a=0;a<8;a+=1)d[a]=1<<a;for(var a=8;a<256;a+=1)d[a]=d[a-4]^d[a-5]^d[a-6]^d[a-8];for(var a=0;a<255;a+=1)v[d[a]]=a;var h={};return h.glog=function(p){if(p<1)throw"glog("+p+")";return v[p]},h.gexp=function(p){for(;p<0;)p+=255;for(;p>=256;)p-=255;return d[p]},h})();function c(d,v){if(typeof d.length=="undefined")throw d.length+"/"+v;var a=(function(){for(var p=0;p<d.length&&d[p]==0;)p+=1;for(var A=new Array(d.length-p+v),u=0;u<d.length-p;u+=1)A[u]=d[u+p];return A})(),h={};return h.getAt=function(p){return a[p]},h.getLength=function(){return a.length},h.multiply=function(p){for(var A=new Array(h.getLength()+p.getLength()-1),u=0;u<h.getLength();u+=1)for(var l=0;l<p.getLength();l+=1)A[u+l]^=s.gexp(s.glog(h.getAt(u))+s.glog(p.getAt(l)));return c(A,0)},h.mod=function(
Line truncated
|
||||
`),hostName:s,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},m={containers:[{container:"amnezia-awg",awg:{isThirdPartyConfig:!0,last_config:JSON.stringify(c),port:String(n.port),protocol_version:r.header_protection_key?"3.1":"2",transport_proto:"udp"}}],defaultContainer:"amnezia-awg",description:t,hostName:s};return n.dns[0]&&(m.dns1=n.dns[0]),n.dns[1]&&(m.dns2=n.dns[1]),m}function Zi(e){let t="";for(let n=0;n<e.length;n+=32768)t+=String.fromCharCode(...e.subarray(n,n+32768));return btoa(t).replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,"")}async function es(e){let t=globalThis;if(typeof t.CompressionStream=="undefined")return null;try{let n=new t.Blob([e]).stream().pipeThrough(new t.CompressionStream("deflate")),r=new Uint8Array(await new t.Response(n).arrayBuffer()),o=new Uint8Array(4+r.length);return new DataView(o.buffer).setUint32(0,e.length,!1),o.set(r,4),o}catch{return null}}async function Kn(e,t,n=!0){let r=new TextEncoder().encode(JSON.stringify(Xi(e,t))),o=n?await es(r):null;return`vpn://${Zi(o!=null?o:r)}`}var Eo=e=>e.replace(/^vpn:\/\//,"");var To=["height","marginTop","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"];function je(e,t={}){let n=i("div",{class:`acc${t.inset?" inset":""}`}),r=e.map((f,T)=>{var P;let M=f.body.filter(d=>!!d),b=!M.length,O=[f.icon,i("span",{class:"acc-title"},i("span",{class:"t"},f.title),(P=f.tag)!=null?P:null),f.val?i("span",{class:`acc-val${f.valHide?" hide-open":""}`},f.val):null],B=T===t.open&&!b,D=b?i("div",{class:"acc-head"},...O):i("button",{type:"button",class:"acc-head","aria-expanded":String(B),onclick:()=>g(R)},...O,z("chevron","i acc-chev")),R=i("div",{class:`acc-row${b?" still":""}${B?" open":""}`},D,i("div",{class:"acc-body"},...M));return n.appendChild(R),R}),o=f=>f.querySelector(".acc-body"),s=()=>r.forEach((f,T)=>{let M=f.classList.contains("open");f.classList.toggle("rt",T===0||M||r[T-1].classList.contains("open")),f.classList.toggle("rb",T===r.length-1||M||r[T+1].classList.contains("open"))}),c=f=>{let T=getComputedStyle(f),M={};for(let b of To)M[b]=b==="height"?`${f.getBoundingClientRect().height}px`:T[b];return M},m=()=>r.forEach(f=>{var T;return(T=f.querySelector("button.acc-head"))==null?void 0:T.setAttribute("aria-expanded",String(f.classList.contains("open")))});function g(f){var B;let T=r.map(c);r.forEach(D=>D.getAnimations().forEach(R=>R.cancel())),r.forEach(D=>o(D).getAnimations().forEach(R=>R.cancel()));let M=!f.classList.contains("open"),b=r.filter(D=>D.classList.contains("open")&&(D===f||M));r.forEach(D=>{D.classList.remove("closing"),D!==f&&D.classList.remove("open")}),f.classList.toggle("open",M),s();let O=yt();r.forEach((D,R)=>{let P=c(D);To.some(d=>T[R][d]!==P[d])&&(b.includes(D)&&D.classList.add("closing"),$(D,[T[R],P],{duration:Ae.duration,easing:Ae.easing}).onfinish=()=>D.classList.remove("closing"))}),b.forEach(D=>$(o(D),[{opacity:1},{opacity:0,filter:"blur(2px)"}],{duration:160,easing:Z,fill:"forwards"})),M&&$(o(f),[{opacity:0,filter:"blur(2px)"},{opacity:1,filter:"blur(0px)"}],{duration:300,easing:"cubic-bezier(0,0,.58,1)"}),bt(O),m(),(B=t.onToggle)==null||B.call(t,r.indexOf(f),M,!1)}return s(),{el:n,openIndex:()=>r.findIndex(f=>f.classList.contains("open")),setOpen(f){r.forEach((T,M)=>T.classList.toggle("open",M===f&&!T.classList.contains("still"))),s(),m(),r.forEach((T,M)=>{var b;return(b=t.onToggle)==null?void 0:b.call(t,M,T.classList.contains("open"),!0)})}}}function Lo(e,t,n){let r=i("span",{class:"seg-pill"}),o=i("div",{class:"seg appseg",role:"tablist"},r),s=e.map(b=>{let O=i("button",{type:"button",class:"seg-b",role:"tab","aria-label":b.label,title:b.label,onclick:()=>M(b.value)},z(b.icon),i("span",{class:"seg-l"},b.label));return O.dataset.v=b.value,o.appendChild(O),O}),c=b=>b.querySelector(".seg-l"),m=()=>s.forEach(b=>{let O=b.dataset.v===t;b.classList.toggle("on",O),b.setAttribute("aria-selected",String(O))}),g=()=>{let b=s.find(O=>O.dataset.v===t);return b&&b.offsetWidth?[b.offsetLeft,o.clientWidth-b.offsetLeft-b.offsetWidth]:null},f=()=>{let b=g();b&&(r.style.left=`${b[0]}px`,r.style.right=`${b[1]}px`)},T=0;function M(b){if(b===t)return;let O=s.findIndex(C=>C.dataset.v===t),B=s.findIndex(C=>C.dataset.v===b),D=getComputedStyle(r),R=parseFloat(D.left)||0,P=parseFloat(D.right)||0,d=s.map(C=>parseFloat(getComputedStyle(C).flexGrow)||0),v=c(s[O]),a=v.getBoundingClientRect().width;[...s,...s.map(c)].forEach(C=>C.getAnimations().forEach(I=>I.cancel())),t=b,m(),s.forEach((C,I)=>{let G=I===B?1:0;d[I]!==G&&$(C,[{flexGrow:d[I]},{flexGrow:G}],{duration:q.duration,easing:q.easing})}),$(v,[{opacity:1,maxWidth:`${a}px`,marginLeft:"0px"},{opacity:0,maxWidth:"0px",marginLeft:"-8px"}],{duration:220,easing:"ease-out"}),$(c(s[B]),[{opacity:0,filter:"blur(4px)"},{opacity:1,filter:"none"}],{duration:280,delay:70,easing:j,fill:"backwards"});let h=B>O,p=Se()?q:hr,A=performance.now(),u=Math.m
Line truncated
|
||||
`).flatMap((f,T)=>T?[`
|
||||
`,So(f,t)]:[So(f,t)]));r();let o=!!Ze(e.filename,e.conf),s=i("button",{type:"button",class:"btn soft sm",onclick:()=>{t=!t,s.replaceChildren(z(t?"x":"key"),i("span",{},t?_("Hide key"):_("Show key"))),r(),n.querySelectorAll(".mask, .k").forEach(f=>$(f,[{filter:"blur(4px)",opacity:.4},{filter:"none",opacity:1}],{duration:320,easing:j}))}},z("key"),i("span",{},_("Show key"))),c=i("button",{type:"button",class:"btn soft sm",onclick:f=>he(e.conf,_("Configuration copied"),f.currentTarget)},z("copy"),i("span",{class:"lbl"},_("Copy"))),m=i("div",{class:"filecard"},i("div",{class:"fc-row"},i("span",{class:"filecard-ic"},".conf"),i("span",{class:"t"},i("span",{class:"mono"},e.filename),i("span",{},_("For computers and routers")))),i("button",{type:"button",class:"btn accent sm block",onclick:()=>Tt(e.filename,e.conf)},z(o?"open":"download"),i("span",{},o?_("Share file"):_("Download")))),g=je([{icon:Q("file"),title:_("Configuration"),body:[i("div",{class:"confbar"},s,c),n]}],{inset:!0});return i("div",{class:"step-box"},m,g.el)}function Io(e){let t=i("span",{class:"osm-p"},ce[e]),n=ao(Ct(e,"ios"),Ct(e,"android"));return{el:i("span",{class:"scanline"},i("span",{},...Ke(_("In %s:"),t)),n.el),set(r){te(t,ce[r],void 0,{whole:!0}),n.set(Ct(r,"ios"),Ct(r,"android"))}}}function Go(e){let t=i("span",{class:"tt"}),n=i("span",{class:"tt-m"}),r=i("span",{class:"hp-tip","aria-hidden":"true"},t,n),o=i("button",{type:"button",class:"hp-b",onclick:()=>Tt(e().file,e().text)},z("download")),s=i("button",{type:"button",class:"hp-b"},z("copy")),c=i("div",{class:"hpill",role:"group","aria-label":_("The connection"),"data-key":"conn"},o,s,r),m=null,g=0,f=0,T=a=>{var h;return a===s&&s.classList.contains("done")?_("Copied"):(h=a.getAttribute("aria-label"))!=null?h:""},M=(a,h)=>{n.textContent=h;let p=n.offsetWidth+20;return Math.min(a.offsetLeft+a.offsetWidth/2,c.offsetWidth+46-p/2)},b=a=>`translateX(${a}px) translateX(-50%)`,O=a=>{let h=getComputedStyle(r).transform;r.getAnimations().forEach(p=>p.cancel()),r.style.transform=b(a),$(r,[{transform:h},{transform:b(a)}],{duration:q.duration,easing:q.easing})},B=a=>te(t,a),D=a=>{if(clearTimeout(g),m===a&&r.classList.contains("on"))return;if(m=a,r.classList.contains("on")){let p=T(a);return O(M(a,p)),B(p)}let h=()=>{let p=T(a);Ne(t,p);let A=M(a,p);r.getAnimations().forEach(u=>u.cancel()),r.style.transform=b(A),r.classList.add("on"),$(r,[{opacity:0,transform:`${b(A)} translateY(-3px) scale(.96)`,filter:"blur(3px)"},{opacity:1,transform:b(A),filter:"blur(0px)"}],{duration:220,easing:j})};performance.now()<f?h():g=window.setTimeout(h,420)},R=()=>{clearTimeout(g),m=null,r.classList.contains("on")&&(f=performance.now()+500,r.classList.remove("on"),$(r,[{opacity:1},{opacity:0}],{duration:120,easing:"ease-out"}))};for(let a of[o,s])a.addEventListener("pointerenter",h=>{h.pointerType==="mouse"&&D(a)}),a.addEventListener("focus",()=>{a.matches(":focus-visible")&&D(a)}),a.addEventListener("blur",R);c.addEventListener("pointerleave",R);let P=a=>{let h=z(a);s.querySelector("svg").replaceWith(h),$(h,[{opacity:0,transform:"scale(.6)",filter:"blur(3px)"},{opacity:1,transform:"none",filter:"none"}],{duration:xe.duration,easing:xe.easing})},d=()=>{if(m!==s||!r.classList.contains("on"))return;let a=T(s);O(M(s,a)),B(a)},v=0;return s.addEventListener("click",()=>{let a=e();he(a.text,a.msg),clearTimeout(v),s.classList.contains("done")||(s.classList.add("done"),P("check"),d()),v=window.setTimeout(()=>{s.classList.remove("done"),P("copy"),d()},1600)}),{el:c,sync(){let a=e().app;o.setAttribute("aria-label",N(_("Download %s config"),a)),s.setAttribute("aria-label",N(_("Copy %s config"),a))}}}function zo(e){let t=i("b",{},_("Waiting for the connection")),n=i("span",{class:"ws",hidden:!0}),r=i("div",{class:"way",role:"status","aria-live":"polite"},i("div",{class:"way-row"},i("span",{class:"way-end"},z(e.kind)),i("span",{class:"way-track"},i("span",{class:"way-glow"},i("i")),i("span",{class:"way-fill"})),i("span",{class:"way-end home"},z("server"))),i("div",{class:"way-text"},i("span",{class:"t"},t,n)));return{el:r,connected(){r.classList.add("done"),te(t,N(_("%s connected"),e.name))},gaveUp(){r.classList.add("stopped"),te(t,_("No connection yet")),n.textContent=_("Close this and open it again to keep checking."),n.hidden=!1,$(t.parentElement,[{opacity:0,filter:"blur(4px)"},{opacity:1,filter:"none"}],{duration:280,easing:j})}}}function Ko(e,t=4){window.setTimeout(async()=>{var n;try{let r=await fe("state");ke(r),At()||Ee(),!((n=r.person.devices.find(o=>o.id===e))!=null&&n.online)&&t>1&&Ko(e,t-1)}catch{}},1500)}function Uo(e,t,n){let r=ct(),o=0,s=0,c=!1,m=Date.now(),g=async()=>{if(o=0,!c){if(Date.now()-m>6e5){c=!0,n();return}if(document.hidden)return f();try{let M=await fe("state");ke(M);let b=M.person.devices.find(O=>O.id===e.id);if(b&&b.handshake>r){c=!0,t(),b.online||Ko(e.id);return}}catch(M){if(jt(M)){c=!0;return}}s++,f()}},f=()=>{!c&&!o&&(o=window.setTimeout(g,s<6?5e3:s<12?15e3:3e4))},T=()=>{!document.hidden&&!c&&!o&&g(
Line truncated
|
||||
@@ -9,7 +9,7 @@ import { serve } from 'dawnline.portal';
|
||||
|
||||
let env = {};
|
||||
for (let k in [ 'REQUEST_METHOD', 'REQUEST_URI', 'REMOTE_ADDR', 'HTTPS', 'CONTENT_LENGTH', 'CONTENT_TYPE',
|
||||
'HTTP_HOST', 'HTTP_ORIGIN', 'HTTP_USER_AGENT', 'HTTP_ACCEPT',
|
||||
'HTTP_HOST', 'HTTP_ORIGIN', 'HTTP_USER_AGENT', 'HTTP_ACCEPT', 'HTTP_ACCEPT_LANGUAGE',
|
||||
// The visitor behind Cloudflare (believed only when REMOTE_ADDR is Cloudflare's).
|
||||
'HTTP_CF_CONNECTING_IP' ])
|
||||
env[k] = getenv(k);
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
// servers, people (and their devices), settings, home (services, circles),
|
||||
// maint (Diagnostics, backups, removal) and updates (Components). Each module
|
||||
// exports `methods` as { name: { args, call } }; read-only users get the
|
||||
// methods listed under "read" in acl.d/luci-app-dawnline.json.
|
||||
// methods listed under "read" in acl.d/luci-app-dawnline.json. Every method
|
||||
// also takes `lang`, the admin page's language, and answers in it (its
|
||||
// errors and the texts the backend writes, through dawnline.i18n).
|
||||
'use strict';
|
||||
|
||||
import * as status from 'dawnline.rpc.status';
|
||||
@@ -14,9 +16,29 @@ import * as settings from 'dawnline.rpc.settings';
|
||||
import * as home from 'dawnline.rpc.home';
|
||||
import * as maint from 'dawnline.rpc.maint';
|
||||
import * as updates from 'dawnline.rpc.updates';
|
||||
import * as i18n from 'dawnline.i18n';
|
||||
|
||||
/** The methods with `lang` added: the language is set for the call, the method never sees it. */
|
||||
function in_lang(methods) {
|
||||
let out = {};
|
||||
for (let name, m in methods) {
|
||||
let call = m.call;
|
||||
out[name] = {
|
||||
...m,
|
||||
args: { ...(m.args ?? {}), lang: '' },
|
||||
call: function(req) {
|
||||
i18n.use(req.args?.lang);
|
||||
if (req.args)
|
||||
delete req.args.lang;
|
||||
return call(req);
|
||||
},
|
||||
};
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
return {
|
||||
'luci.dawnline': {
|
||||
'luci.dawnline': in_lang({
|
||||
...status.methods,
|
||||
...servers.methods,
|
||||
...people.methods,
|
||||
@@ -24,5 +46,5 @@ return {
|
||||
...home.methods,
|
||||
...maint.methods,
|
||||
...updates.methods,
|
||||
},
|
||||
}),
|
||||
};
|
||||
@@ -1,5 +1,6 @@
|
||||
// Dawnline: "Check access" — walks the same rules the nft table and the
|
||||
// client configuration apply, and says in words where a connection stops.
|
||||
// client configuration apply, and says in words where a connection stops
|
||||
// (in the admin's language: each step is a whole sentence).
|
||||
|
||||
'use strict';
|
||||
|
||||
@@ -9,17 +10,68 @@ import * as net from 'dawnline.net';
|
||||
import * as live from 'dawnline.live';
|
||||
import * as view from 'dawnline.view';
|
||||
import * as awg from 'dawnline.awg';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
const STATE_TEXT = {
|
||||
no_server: 'they have no server',
|
||||
server_off: 'their server is turned off',
|
||||
paused: 'they are paused',
|
||||
expired: 'their access has ended',
|
||||
quota: 'they used up their data',
|
||||
hours: 'it is outside their allowed hours',
|
||||
};
|
||||
/** "Bob can't connect: they are paused", by the person's state (core.person_state). */
|
||||
function cant_connect(name, st) {
|
||||
if (st == 'no_server')
|
||||
return sprintf(_("%s can't connect: they have no server"), name);
|
||||
if (st == 'server_off')
|
||||
return sprintf(_("%s can't connect: their server is turned off"), name);
|
||||
if (st == 'paused')
|
||||
return sprintf(_("%s can't connect: they are paused"), name);
|
||||
if (st == 'expired')
|
||||
return sprintf(_("%s can't connect: their access has ended"), name);
|
||||
if (st == 'quota')
|
||||
return sprintf(_("%s can't connect: they used up their data"), name);
|
||||
if (st == 'hours')
|
||||
return sprintf(_("%s can't connect: it is outside their allowed hours"), name);
|
||||
return sprintf(_("%s can't connect: %s"), name, st);
|
||||
}
|
||||
|
||||
const ACCESS_TEXT = { lan: 'Home only', internet: 'Internet only', both: 'Home and Internet' };
|
||||
/** "Bob · Phone can't be reached: it is turned off", by the device and its person's state. */
|
||||
function cant_reach(who, disabled, st) {
|
||||
if (disabled)
|
||||
return sprintf(_("%s can't be reached: it is turned off"), who);
|
||||
if (st == 'no_server')
|
||||
return sprintf(_("%s can't be reached: they have no server"), who);
|
||||
if (st == 'server_off')
|
||||
return sprintf(_("%s can't be reached: their server is turned off"), who);
|
||||
if (st == 'paused')
|
||||
return sprintf(_("%s can't be reached: they are paused"), who);
|
||||
if (st == 'expired')
|
||||
return sprintf(_("%s can't be reached: their access has ended"), who);
|
||||
if (st == 'quota')
|
||||
return sprintf(_("%s can't be reached: they used up their data"), who);
|
||||
if (st == 'hours')
|
||||
return sprintf(_("%s can't be reached: it is outside their allowed hours"), who);
|
||||
return sprintf(_("%s can't be reached: %s"), who, st);
|
||||
}
|
||||
|
||||
/** A person's access as the admin page names it. */
|
||||
function access_text(a) {
|
||||
if (a == 'lan')
|
||||
return _('Home only');
|
||||
if (a == 'internet')
|
||||
return _('Internet only');
|
||||
if (a == 'both')
|
||||
return _('Home and Internet');
|
||||
return a;
|
||||
}
|
||||
|
||||
/** "Bob has Internet only": the step where access stops a connection. */
|
||||
function has_access(name, a) {
|
||||
if (a == 'lan')
|
||||
return sprintf(_('%s has Home only'), name);
|
||||
if (a == 'internet')
|
||||
return sprintf(_('%s has Internet only'), name);
|
||||
return sprintf(_('%s has Home and Internet'), name);
|
||||
}
|
||||
|
||||
/** "Bob reaches lan, guest." (the person's home networks), or that there is none. */
|
||||
function reaches(name, devs) {
|
||||
return length(devs) ? sprintf(_('%s reaches %s.'), name, join(', ', devs)) : sprintf(_('%s reaches no home network.'), name);
|
||||
}
|
||||
|
||||
function step(ok, title, detail) {
|
||||
return { ok: !!ok, title, detail: detail ?? '' };
|
||||
@@ -65,7 +117,7 @@ function peer_of(dmp, d) {
|
||||
|
||||
/** What the device sends to the router: its configuration's AllowedIPs. */
|
||||
function routed(m, srv, p, d) {
|
||||
return { nets: awg.allowed_ips(m, srv, p), what: 'Its configuration', list: null };
|
||||
return awg.allowed_ips(m, srv, p);
|
||||
}
|
||||
|
||||
/** The home network (interface) of a server that holds an address. */
|
||||
@@ -87,19 +139,19 @@ function router_addrs(snap) {
|
||||
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.');
|
||||
return step(false, sprintf(_('%s is turned off'), d.name), _('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]);
|
||||
return step(false, cant_connect(p.name, st), '');
|
||||
return step(true, sprintf(_('%s is active'), p.name), 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.');
|
||||
return step(false, sprintf(_('%s has never connected'), who), _('There is no session the router could reach.'));
|
||||
if (!live.online(dmp, d.id, peer))
|
||||
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`, '');
|
||||
return step(false, sprintf(_("%s isn't connected right now"), who), _('The router reaches it only while its VPN is on.'));
|
||||
return step(true, sprintf(_('%s is connected'), who), '');
|
||||
}
|
||||
|
||||
/** A device → somewhere: the router, home, another device or the internet. */
|
||||
@@ -107,18 +159,18 @@ 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`, '') ];
|
||||
return [ step(false, sprintf(_('%s has no server'), d.name), '') ];
|
||||
let steps = [ person_ok(m, p, d, states) ];
|
||||
if (!steps[0].ok)
|
||||
return steps;
|
||||
let r = routed(m, srv, p, d);
|
||||
let allowed = r.nets;
|
||||
let allowed = routed(m, srv, p, d);
|
||||
let via = (ip) => {
|
||||
let hit = in_nets(ip, allowed);
|
||||
let what = r.list ? `${r.what}: ${r.list}` : `AllowedIPs ${join(', ', filter(allowed, (x) => index(x, ':') < 0))}`;
|
||||
// The configuration's own words: the option and its value.
|
||||
let what = `AllowedIPs ${join(', ', filter(allowed, (x) => index(x, ':') < 0))}`;
|
||||
return hit
|
||||
? step(true, `${r.what} sends it to the router`, what)
|
||||
: step(false, `${r.what} doesn't send it to the router`, `${what}: the device's own network handles it.`);
|
||||
? step(true, _('Its configuration sends it to the router'), what)
|
||||
: step(false, _("Its configuration doesn't send it to the router"), sprintf(_("%s: the device's own network handles it."), what));
|
||||
};
|
||||
|
||||
// Another device.
|
||||
@@ -126,27 +178,27 @@ function from_device(m, d, t, states, dmp, snap) {
|
||||
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', '') ];
|
||||
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.'));
|
||||
return stop(steps, step(false, sprintf(_('%s is on another server'), who), _('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.'));
|
||||
return stop(steps, step(false, has_access(p.name, 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.'));
|
||||
return stop(steps, step(false, has_access(q.name, 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.'));
|
||||
return stop(steps, step(false, sprintf(_('"Devices reach each other" is off on %s'), 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.'));
|
||||
return stop(steps, step(false, sprintf(_('%s and %s are not in one circle'), p.name, q.name),
|
||||
`${p.name}: ${a?.name ?? _('no circle')} · ${q.name}: ${b?.name ?? _('no circle')}`));
|
||||
push(steps, step(true, sprintf(_('Both are in %s'), 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', ''));
|
||||
push(steps, step(true, q.id == p.id ? sprintf(_("Both are %s's devices"), p.name) : _('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}`, ''));
|
||||
return stop(steps, step(false, cant_reach(who, t.dev.disabled, st), ''));
|
||||
push(steps, via(t.ip));
|
||||
push(steps, connected(dmp, t.dev, who));
|
||||
return steps;
|
||||
@@ -156,17 +208,20 @@ function from_device(m, d, t, states, dmp, snap) {
|
||||
if (index(router_addrs(snap), t.ip) >= 0) {
|
||||
let portal = m.settings.portal_enabled && (t.port == m.settings.portal_port || (core.portal_http(m) && t.port == core.portal_http_port(m)));
|
||||
if (t.port == 53)
|
||||
push(steps, step(true, `${t.ip} is this router: DNS is open to everyone`, ''));
|
||||
push(steps, step(true, sprintf(_('%s is this router: DNS is open to everyone'), t.ip), ''));
|
||||
else if (portal)
|
||||
push(steps, step(true, `${t.ip} is this router: the personal portal is open to everyone`, ''));
|
||||
push(steps, step(true, sprintf(_('%s is this router: the personal portal is open to everyone'), t.ip), ''));
|
||||
else if (!home_access(p))
|
||||
return stop(steps, step(false, `${t.ip} is this router`, `${p.name} has ${ACCESS_TEXT[p.access]}: only DNS and the portal on the router.`));
|
||||
return stop(steps, step(false, sprintf(_('%s is this router'), t.ip), sprintf(p.access == 'lan'
|
||||
? _('%s has Home only: only DNS and the portal on the router.')
|
||||
: _('%s has Internet only: only DNS and the portal on the router.'), p.name)));
|
||||
else {
|
||||
// Like any home address: only on the networks the person reaches.
|
||||
let h = core.person_home(srv, p, snap);
|
||||
if (!h.all && !in_nets(t.ip, h.nets))
|
||||
return stop(steps, step(false, `${t.ip} is this router on a network ${p.name} doesn't reach`, `${p.name} reaches ${join(', ', h.devs) || 'no home network'}.`));
|
||||
push(steps, step(true, `${t.ip} is this router`, h.all ? 'Home access includes the router.' : `On one of the networks ${p.name} reaches.`));
|
||||
return stop(steps, step(false, sprintf(_("%s is this router on a network %s doesn't reach"), t.ip, p.name), reaches(p.name, h.devs)));
|
||||
push(steps, step(true, sprintf(_('%s is this router'), t.ip),
|
||||
h.all ? _('Home access includes the router.') : sprintf(_('On one of the networks %s reaches.'), p.name)));
|
||||
}
|
||||
push(steps, via(t.ip));
|
||||
return steps;
|
||||
@@ -175,14 +230,14 @@ function from_device(m, d, t, states, dmp, snap) {
|
||||
// A tunnel address no device has.
|
||||
let tn = in_tunnels(m, t.ip);
|
||||
if (tn)
|
||||
return stop(steps, step(false, `No device uses ${t.ip}`, `It is in the tunnel network ${tn}.`));
|
||||
return stop(steps, step(false, sprintf(_('No device uses %s'), t.ip), sprintf(_('It is in the tunnel network %s.'), tn)));
|
||||
|
||||
// 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.`));
|
||||
return stop(steps, step(false, sprintf(_('%s is at home (%s)'), t.ip, hdev), sprintf(_('%s has Internet only.'), p.name)));
|
||||
if (p.access == 'lan' && length(p.services)) {
|
||||
let hit = null;
|
||||
for (let sid in p.services) {
|
||||
@@ -192,28 +247,32 @@ function from_device(m, d, t, states, dmp, snap) {
|
||||
}
|
||||
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'));
|
||||
return stop(steps, step(false, sprintf(_("%s is not one of %s's home services"), t.port ? `${t.ip}:${t.port}` : t.ip, p.name),
|
||||
sprintf(_('Allowed: %s'), names)));
|
||||
push(steps, step(true, sprintf(_("%s is %s, one of %s's home services"), t.ip, hit.name, p.name),
|
||||
length(hit.ports) ? sprintf(_('Ports %s'), join(', ', hit.ports)) : _('All ports')));
|
||||
}
|
||||
else {
|
||||
let h = core.person_home(srv, p, snap);
|
||||
if (!in_nets(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.`));
|
||||
return stop(steps, step(false, sprintf(_("%s is in %s, which %s doesn't reach"), t.ip, hdev, p.name), reaches(p.name, h.devs)));
|
||||
push(steps, step(true, sprintf(_('%s is in home network %s'), t.ip, hdev),
|
||||
h.all ? _('Home access reaches every home network.') : sprintf(_('One of the networks %s reaches.'), p.name)));
|
||||
}
|
||||
push(steps, via(t.ip));
|
||||
push(steps, step(true, 'The firewall lets it through', `${srv.ifname} → ${join(', ', sn.zones) || 'home'}`));
|
||||
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_nets(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.'));
|
||||
return stop(steps, step(false, sprintf(_("%s isn't in %s's home network"), t.ip, srv.name), _('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.`));
|
||||
return stop(steps, step(true, sprintf(_('%s is on the internet'), t.ip),
|
||||
sprintf(_("%s has Home only: their device's own internet reaches it, not the tunnel."), p.name)));
|
||||
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'}.`));
|
||||
push(steps, step(true, sprintf(_('%s is on the internet'), t.ip), srv.lan_like ? _('It leaves like a home device would.')
|
||||
: sn.wan.dev != null ? sprintf(_('It leaves through %s.'), sn.wan.dev) : _('It leaves through the WAN.')));
|
||||
return steps;
|
||||
}
|
||||
|
||||
@@ -222,22 +281,22 @@ 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`, '') ];
|
||||
return [ step(false, sprintf(_('%s has no server'), d.name), '') ];
|
||||
let who = `${p.name} · ${d.name}`;
|
||||
let hdev = in_tunnels(m, ip) ? null : 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})`, '') ];
|
||||
return [ step(false, sprintf(_("%s isn't in %s's home network"), ip, srv.name), _("Only home devices reach people's devices.")) ];
|
||||
let steps = [ step(true, sprintf(_('%s is at home (%s)'), ip, 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.'));
|
||||
return stop(steps, step(false, p.access == 'lan' ? sprintf(_('%s has only some home services'), p.name) : has_access(p.name, p.access),
|
||||
_('Home devices reach only people with home access.')));
|
||||
let h = core.person_home(srv, p, snap);
|
||||
if (!in_nets(ip, h.nets))
|
||||
return stop(steps, step(false, `${p.name} doesn't reach ${hdev}`, 'Networks a person does not reach cannot reach them either.'));
|
||||
return stop(steps, step(false, sprintf(_("%s doesn't reach %s"), p.name, 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, 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;
|
||||
}
|
||||
@@ -246,9 +305,9 @@ function to_device(m, ip, d, states, dmp, snap) {
|
||||
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.`);
|
||||
die(sprintf(_('"%s" is not a device or an IPv4 address.'), from));
|
||||
if (!b)
|
||||
die(`"${to}" is not a device or an IPv4 address.`);
|
||||
die(sprintf(_('"%s" is not a device or an IPv4 address.'), to));
|
||||
let usage = core.load_usage();
|
||||
let states = view.states(m, usage);
|
||||
let dmp = live.dump(m);
|
||||
@@ -259,7 +318,7 @@ export function check(m, from, to) {
|
||||
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.');
|
||||
die(_('Choose a device on at least one side.'));
|
||||
let ok = length(filter(steps, (s) => !s.ok)) == 0;
|
||||
return { ok, steps };
|
||||
};
|
||||
@@ -22,6 +22,7 @@ import * as nft from 'dawnline.nft';
|
||||
import * as fw from 'dawnline.fw';
|
||||
import * as netifd from 'dawnline.netifd';
|
||||
import * as migrate from 'dawnline.migrate';
|
||||
import { _, L_ } from 'dawnline.i18n';
|
||||
|
||||
const HOSTS_FILE = '/tmp/hosts/dawnline';
|
||||
/** The network signature the last apply() worked from (the agent compares against it). */
|
||||
@@ -93,9 +94,9 @@ function nft_result(err, present) {
|
||||
return null;
|
||||
}
|
||||
if (was != err) {
|
||||
log('Access rules', present
|
||||
? "couldn't be updated — the previous rules stay, and changes to access wait until they load"
|
||||
: "couldn't load — no device is loaded into the tunnels until they do", 'error', err);
|
||||
log(L_('Access rules'), present
|
||||
? L_("couldn't be updated - the previous rules stay, and changes to access wait until they load")
|
||||
: L_("couldn't load - no device is loaded into the tunnels until they do"), 'error', err);
|
||||
ensure_dir(RUN_DIR);
|
||||
writefile(NFT_ERR, err);
|
||||
}
|
||||
@@ -138,18 +139,19 @@ export function firewall_drift(m) {
|
||||
|
||||
/**
|
||||
* What an admin should hear when a sync did not fully take: the access table
|
||||
* failed, or a server did not accept its devices. Null when all went in.
|
||||
* failed, or a server did not accept its devices (sentences in the caller's
|
||||
* language, with what nft or awg said). Null when all went in.
|
||||
*/
|
||||
function sync_warning(m, table, peers) {
|
||||
let out = [];
|
||||
if (table != null)
|
||||
push(out, nft.present()
|
||||
? `Access rules couldn't be updated (${table}): the previous rules stay, so this change isn't in effect yet.`
|
||||
: `Access rules couldn't load (${table}): no device is loaded into the tunnels until they do.`);
|
||||
? sprintf(_("Access rules couldn't be updated (%s): the previous rules stay, so this change isn't in effect yet."), table)
|
||||
: sprintf(_("Access rules couldn't load (%s): no device is loaded into the tunnels until they do."), table));
|
||||
for (let id, r in peers)
|
||||
if (r != 'ok' && r != 'down')
|
||||
push(out, `Couldn't load devices into ${m.servers[id]?.name ?? id}: ${r}.`);
|
||||
return length(out) ? join(' ', out) + ' Open Diagnostics → Health.' : null;
|
||||
push(out, sprintf(_("Couldn't load devices into %s: %s."), m.servers[id]?.name ?? id, r));
|
||||
return length(out) ? join(' ', [ ...out, _('Open Diagnostics → Health.') ]) : null;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -242,7 +244,7 @@ export function apply(opts) {
|
||||
return { network, firewall, lp, peers: s.peers, warning: s.warning };
|
||||
});
|
||||
loop.remember(r.lp);
|
||||
return { network: r.network, firewall: r.firewall, like_home: r.lp.error ? { error: r.lp.error } : !r.lp.off, peers: r.peers, warning: r.warning };
|
||||
return { network: r.network, firewall: r.firewall, like_home: r.lp.error ? { error: loop.error_text(r.lp.error) } : !r.lp.off, peers: r.peers, warning: r.warning };
|
||||
};
|
||||
|
||||
/** Remove everything Dawnline created (used by the uninstaller). */
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// Dawnline — the AmneziaWG core: keys, disguise (obfuscation), client
|
||||
// configurations (.conf, AmneziaVPN key), the netifd options of a server's
|
||||
// tunnel, its peers (`awg syncconf`, no restart), live counters and what the
|
||||
// watchdog and Health check about it. Plain WireGuard is AmneziaWG with the
|
||||
// disguise off.
|
||||
// tunnel, its peers (`awg syncconf`, no restart), live counters, the words for
|
||||
// why a tunnel is kept down (blocked_text) and what the watchdog and Health
|
||||
// check about it. Plain WireGuard is AmneziaWG with the disguise off.
|
||||
|
||||
import { readfile, stat, unlink } from 'fs';
|
||||
import {
|
||||
@@ -13,6 +13,7 @@ import * as core from 'dawnline.core';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as pkg from 'dawnline.pkg';
|
||||
import * as builds from 'dawnline.awg_builds';
|
||||
import { _, L_ } from 'dawnline.i18n';
|
||||
|
||||
/** Names in .conf files (and AmneziaVPN keys); netifd uses `awg_<key>`. */
|
||||
export const OBF_CONF = {
|
||||
@@ -98,15 +99,15 @@ export function genpsk() {
|
||||
export function new_keys(public_key) {
|
||||
let psk = genpsk();
|
||||
if (!valid_key(psk))
|
||||
die('Key generation failed (no random data).');
|
||||
die(_('Key generation failed (no random data).'));
|
||||
if (public_key) {
|
||||
if (!valid_key(public_key))
|
||||
die('Invalid public key.');
|
||||
die(_('Invalid public key.'));
|
||||
return { public_key, preshared_key: psk };
|
||||
}
|
||||
let priv = genkey(), pub = pubkey(priv);
|
||||
if (!pub)
|
||||
die('Key generation failed (is amneziawg-tools installed?).');
|
||||
die(_('Key generation failed (is amneziawg-tools installed?).'));
|
||||
return { private_key: priv, public_key: pub, preshared_key: psk };
|
||||
};
|
||||
|
||||
@@ -114,7 +115,7 @@ export function new_keys(public_key) {
|
||||
export function server_keys() {
|
||||
let priv = genkey(), pub = pubkey(priv);
|
||||
if (!pub)
|
||||
die('Key generation failed (is amneziawg-tools installed?).');
|
||||
die(_('Key generation failed (is amneziawg-tools installed?).'));
|
||||
return { private_key: priv, public_key: pub };
|
||||
};
|
||||
|
||||
@@ -172,10 +173,11 @@ export function caps() {
|
||||
};
|
||||
|
||||
/**
|
||||
* Why this AmneziaWG cannot run a server's disguise values, or null: a 3.1
|
||||
* preset after a rollback to a 2.0 build would come up without the header
|
||||
* protection every device expects, so such a server is kept down instead
|
||||
* (dawnline.netifd).
|
||||
* Why this AmneziaWG cannot run a server's disguise values, as a reason to
|
||||
* keep the server down (blocked_text): { code: 'disguise', need, installed }
|
||||
* (installed null: none), or null when it can. A 3.1 preset after a rollback
|
||||
* to a 2.0 build would come up without the header protection every device
|
||||
* expects, so such a server is kept down instead (dawnline.netifd).
|
||||
*/
|
||||
export function obf_unsupported(o) {
|
||||
let c = caps();
|
||||
@@ -185,9 +187,9 @@ export function obf_unsupported(o) {
|
||||
let v2 = [ 's3', 's4', 'i1', 'i2', 'i3', 'i4', 'i5' ];
|
||||
let ranged = length(filter([ 'h1', 'h2', 'h3', 'h4' ], (k) => match(`${o?.[k] ?? ''}`, /-/))) > 0;
|
||||
if (has(v3) && !c.v3)
|
||||
return `its disguise needs AmneziaWG 3.1 (installed: ${c.kmod ?? c.tools ?? 'none'})`;
|
||||
return { code: 'disguise', need: '3.1', installed: c.kmod ?? c.tools };
|
||||
if ((has(v2) || ranged) && !c.v2)
|
||||
return `its disguise needs AmneziaWG 2.0 (installed: ${c.kmod ?? c.tools ?? 'none'})`;
|
||||
return { code: 'disguise', need: '2.0', installed: c.kmod ?? c.tools };
|
||||
return null;
|
||||
};
|
||||
|
||||
@@ -293,9 +295,9 @@ export function obf_errors(o) {
|
||||
if (v == null || v == '')
|
||||
continue;
|
||||
if (!match(v, /^[0-9]+(-[0-9]+)?$/))
|
||||
push(errs, `${k} must be a number or range`);
|
||||
push(errs, sprintf(_('%s must be a number or range'), k));
|
||||
else if (hs[v])
|
||||
push(errs, 'h1-h4 must be distinct');
|
||||
push(errs, _('h1-h4 must be distinct'));
|
||||
hs[v] = true;
|
||||
}
|
||||
return errs;
|
||||
@@ -482,7 +484,7 @@ export function sync_peers(m, states) {
|
||||
unlink(f);
|
||||
res[id] = r.code == 0 ? 'ok' : trim(r.out);
|
||||
if (r.code != 0)
|
||||
slog('awg', 'error', "couldn't load devices into the tunnel", trim(r.out), srv.name);
|
||||
slog('awg', 'error', L_("couldn't load devices into the tunnel"), trim(r.out), srv.name);
|
||||
}
|
||||
return res;
|
||||
};
|
||||
@@ -528,6 +530,56 @@ export function server_state(srv) {
|
||||
return { up: !!st?.up, uptime: st?.uptime ?? 0 };
|
||||
};
|
||||
|
||||
/* ---------- why a tunnel is kept down ---------- */
|
||||
|
||||
/*
|
||||
* dawnline.netifd keeps a server's tunnel down for a reason, kept per server
|
||||
* in core.BLOCKED and loaded as `srv.blocked`. apply writes it, at boot and
|
||||
* from the agent with no language, so it holds a code and its values, made
|
||||
* into text when read:
|
||||
* { code: 'ifname', ifname } the interface name is invalid
|
||||
* { code: 'taken', ifname } network.<ifname> exists and isn't Dawnline's
|
||||
* { code: 'disguise', need, installed } obf_unsupported()
|
||||
* Files written by older versions hold the English fragment ("has an invalid
|
||||
* interface name …"), shown as it is.
|
||||
*/
|
||||
|
||||
/** A reason as the service log says it after the server's name: English, like every log line. */
|
||||
export function blocked_note(r) {
|
||||
if (type(r) != 'object')
|
||||
return `${r}`;
|
||||
if (r.code == 'ifname')
|
||||
return sprintf(L_('has an invalid interface name "%s"'), r.ifname);
|
||||
if (r.code == 'taken')
|
||||
return sprintf(L_("can't use the network interface %s: it exists and isn't Dawnline's"), r.ifname);
|
||||
if (r.code == 'disguise')
|
||||
return r.installed ? sprintf(L_('is kept down: its disguise needs AmneziaWG %s (installed: %s)'), r.need, r.installed)
|
||||
: sprintf(L_('is kept down: its disguise needs AmneziaWG %s (installed: none)'), r.need);
|
||||
return L_('is kept down');
|
||||
};
|
||||
|
||||
/**
|
||||
* Why the server's tunnel is kept down (`srv.blocked`), as a sentence with
|
||||
* its name in the reader's language: what the admin UI shows. Null when it
|
||||
* is not kept down.
|
||||
*/
|
||||
export function blocked_text(srv) {
|
||||
let r = srv?.blocked;
|
||||
if (!r)
|
||||
return null;
|
||||
if (type(r) != 'object')
|
||||
return `${srv.name} ${r}.`;
|
||||
if (r.code == 'ifname')
|
||||
return sprintf(_('%s has an invalid interface name "%s".'), srv.name, r.ifname);
|
||||
if (r.code == 'taken')
|
||||
return sprintf(_("%s can't use the network interface %s: it exists and isn't Dawnline's."), srv.name, r.ifname);
|
||||
if (r.code == 'disguise')
|
||||
return r.installed
|
||||
? sprintf(_('%s is kept down: its disguise needs AmneziaWG %s (installed: %s).'), srv.name, r.need, r.installed)
|
||||
: sprintf(_('%s is kept down: its disguise needs AmneziaWG %s (installed: none).'), srv.name, r.need);
|
||||
return sprintf(_('%s is kept down.'), srv.name);
|
||||
};
|
||||
|
||||
/* ---------- watchdog ---------- */
|
||||
|
||||
/** Why a tunnel is down, from netifd and the last related syslog lines. */
|
||||
@@ -553,19 +605,20 @@ export function probes(m, ctx) {
|
||||
// AmneziaWG itself first: without it no tunnel can run (they come back on the next pass).
|
||||
// Missing packages and an unknown protocol are reported once; only the module can be loaded here.
|
||||
let st = state();
|
||||
let base = { id: 'awg', src: 'awg', name: 'AmneziaWG', who: 'AmneziaWG', back: 'is ready again' };
|
||||
let base = { id: 'awg', src: 'awg', name: 'AmneziaWG', who: 'AmneziaWG', back: L_('is ready again') };
|
||||
if (!st.tools || !st.kmod) {
|
||||
push(out, { ...base, ok: false, repair: null,
|
||||
problem: `${st.tools ? "kernel module isn't" : "isn't"} installed: no tunnel can run — install it in Dawnline → Components`,
|
||||
detail: () => `Missing: ${join(', ', st.missing)}.` });
|
||||
problem: st.tools ? L_("kernel module isn't installed: no tunnel can run - install it in Dawnline → Components")
|
||||
: L_("isn't installed: no tunnel can run - install it in Dawnline → Components"),
|
||||
detail: () => sprintf(L_('Missing: %s.'), join(', ', st.missing)) });
|
||||
return out;
|
||||
}
|
||||
push(out, { ...base, ok: st.loaded && st.handler,
|
||||
problem: !st.loaded ? "kernel module isn't loaded" : "isn't known to the network service — restart the network or reboot",
|
||||
problem: !st.loaded ? L_("kernel module isn't loaded") : L_("isn't known to the network service - restart the network or reboot"),
|
||||
detail: !st.loaded
|
||||
? () => sh_out("modprobe amneziawg 2>&1; dmesg 2>/dev/null | grep -i amneziawg | grep -iE 'error|fail|invalid|unknown|disagrees|taint' | tail -n 4")
|
||||
: () => 'netifd reads its protocol handlers when it starts; it was running before AmneziaWG was installed.',
|
||||
repair: !st.loaded ? { what: 'loading it', run: () => system('modprobe amneziawg >/dev/null 2>&1') } : null,
|
||||
: () => L_('netifd reads its protocol handlers when it starts; it was running before AmneziaWG was installed.'),
|
||||
repair: !st.loaded ? { what: L_('loading it'), run: () => system('modprobe amneziawg >/dev/null 2>&1') } : null,
|
||||
});
|
||||
// Without the protocol handler ifup cannot work: the tunnels are not probed (or restarted) one by one.
|
||||
if (st.loaded && !st.handler)
|
||||
@@ -574,13 +627,13 @@ export function probes(m, ctx) {
|
||||
// A tunnel Dawnline may not set up (dawnline.netifd) is reported, never restarted:
|
||||
// an interface of the same name that isn't Dawnline's may be your LAN.
|
||||
let own = core.valid_ifname(srv.ifname) ? ctx.owner?.(srv.ifname) : null;
|
||||
let why = srv.blocked ?? (!core.valid_ifname(srv.ifname) ? `has an invalid interface name "${srv.ifname}"`
|
||||
: own != null && own != srv.id ? `can't use the network interface ${srv.ifname}: it exists and isn't Dawnline's` : null);
|
||||
let why = srv.blocked ?? (!core.valid_ifname(srv.ifname) ? { code: 'ifname', ifname: srv.ifname }
|
||||
: own != null && own != srv.id ? { code: 'taken', ifname: srv.ifname } : null);
|
||||
if (why) {
|
||||
push(out, {
|
||||
id: `up_${srv.id}`, src: 'awg', name: `${srv.name} · AmneziaWG`, who: srv.name, ok: false, repair: null,
|
||||
problem: why, back: 'AmneziaWG is running again',
|
||||
detail: () => 'Choose another interface name in the server settings.',
|
||||
problem: blocked_note(why), back: L_('AmneziaWG is running again'),
|
||||
detail: () => L_('Choose another interface name in the server settings.'),
|
||||
});
|
||||
continue;
|
||||
}
|
||||
@@ -588,10 +641,11 @@ export function probes(m, ctx) {
|
||||
let up = !!s?.up;
|
||||
push(out, {
|
||||
id: `up_${srv.id}`, src: 'awg', name: `${srv.name} · AmneziaWG`, who: srv.name, ok: up && ctx.udp_listening(srv.port),
|
||||
problem: !s ? 'AmneziaWG is missing from the router' : !up ? "AmneziaWG isn't running" : `AmneziaWG isn't accepting connections on port ${srv.port}`,
|
||||
back: `AmneziaWG is running again · accepting connections on port ${srv.port}`,
|
||||
problem: !s ? L_('AmneziaWG is missing from the router') : !up ? L_("AmneziaWG isn't running")
|
||||
: sprintf(L_("AmneziaWG isn't accepting connections on port %d"), srv.port),
|
||||
back: sprintf(L_('AmneziaWG is running again · accepting connections on port %d'), srv.port),
|
||||
detail: () => iface_errors(srv.ifname),
|
||||
repair: s ? { what: 'restarting it', run: () => system(`ifup ${q(srv.ifname)}`) } : { what: 'setting it up again', run: ctx.reapply },
|
||||
repair: s ? { what: L_('restarting it'), run: () => system(`ifup ${q(srv.ifname)}`) } : { what: L_('setting it up again'), run: ctx.reapply },
|
||||
});
|
||||
}
|
||||
return out;
|
||||
|
||||
@@ -13,6 +13,7 @@ import * as live from 'dawnline.live';
|
||||
import * as apply from 'dawnline.apply';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as health from 'dawnline.health';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
const BACKUP_DIR = `${DATA_DIR}/backups`;
|
||||
/**
|
||||
@@ -51,17 +52,16 @@ export function config_errors(c) {
|
||||
let internal = values(net.INTERNAL);
|
||||
let ifnames = {}, ports = {}, subnets = [];
|
||||
for (let id, srv in m.servers) {
|
||||
let who = `Server ${srv.name}`;
|
||||
for (let e in core.server_errors(m, srv, [ ...foreign, ...subnets ]))
|
||||
push(errs, `${who}: ${e}`);
|
||||
push(errs, sprintf(_('Server %s: %s'), srv.name, e));
|
||||
if (ifnames[srv.ifname])
|
||||
push(errs, `${who}: interface ${srv.ifname} is also used by ${ifnames[srv.ifname]}.`);
|
||||
push(errs, sprintf(_('Server %s: interface %s is also used by %s.'), srv.name, srv.ifname, ifnames[srv.ifname]));
|
||||
ifnames[srv.ifname] = srv.name;
|
||||
let t = nc.get('network', srv.ifname);
|
||||
if (index(internal, srv.ifname) >= 0 || (t != null && (t != 'interface' || nc.get('network', srv.ifname, '_dawnline') == null)))
|
||||
push(errs, `${who}: ${srv.ifname} is one of the router's own network interfaces.`);
|
||||
push(errs, sprintf(_("Server %s: %s is one of the router's own network interfaces."), srv.name, srv.ifname));
|
||||
if (ports[srv.port])
|
||||
push(errs, `${who}: UDP ${srv.port} is also used by ${ports[srv.port]}.`);
|
||||
push(errs, sprintf(_('Server %s: UDP %s is also used by %s.'), srv.name, srv.port, ports[srv.port]));
|
||||
ports[srv.port] = srv.name;
|
||||
if (srv.subnet)
|
||||
push(subnets, srv.subnet);
|
||||
@@ -75,10 +75,10 @@ function check_config_dir(dir) {
|
||||
// Its own delta directory: changes staged in LuCI must not leak into the check.
|
||||
let c = cursor(dir, `${dir}/.delta`);
|
||||
if (!c.load('dawnline'))
|
||||
die('The configuration in this file cannot be read.');
|
||||
die(_('The configuration in this file cannot be read.'));
|
||||
let errs = config_errors(c);
|
||||
if (length(errs))
|
||||
die(`This configuration can't be used: ${join(' ', errs)}`);
|
||||
die(sprintf(_("This configuration can't be used: %s"), join(' ', errs)));
|
||||
}
|
||||
|
||||
/** A private scratch directory under RUN_DIR (the caller removes it). */
|
||||
@@ -129,7 +129,8 @@ export function backup_create(reason, keep) {
|
||||
let r = sh(`tar -czf ${q(tmp)} -C / ${files}`);
|
||||
if (r.code != 0 || !rename(tmp, `${BACKUP_DIR}/${name}`)) {
|
||||
unlink(tmp);
|
||||
die(`Backup failed: ${trim(r.out) || 'the archive could not be written (is the flash full?)'}`);
|
||||
let why = trim(r.out);
|
||||
die(why ? sprintf(_('Backup failed: %s'), why) : _('Backup failed: the archive could not be written (is the flash full?)'));
|
||||
}
|
||||
system(`chmod 600 ${q(BACKUP_DIR + '/' + name)}`);
|
||||
let by_kind = {};
|
||||
@@ -144,10 +145,10 @@ export function backup_create(reason, keep) {
|
||||
|
||||
function backup_path(name) {
|
||||
if (!match(name ?? '', NAME))
|
||||
die('Invalid backup name.');
|
||||
die(_('Invalid backup name.'));
|
||||
let p = `${BACKUP_DIR}/${name}`;
|
||||
if (!file_exists(p))
|
||||
die('Backup not found.');
|
||||
die(_('Backup not found.'));
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -158,24 +159,24 @@ function backup_path(name) {
|
||||
function check_archive(path) {
|
||||
let r = sh(`tar -tvzf ${q(path)}`);
|
||||
if (r.code != 0)
|
||||
die('Not a valid backup archive.');
|
||||
die(_('Not a valid backup archive.'));
|
||||
let has_config = false, total = 0;
|
||||
for (let line in split(trim(r.out), '\n')) {
|
||||
let f = split(trim(line), /[ \t]+/);
|
||||
let name = replace(f[length(f) >= 6 ? 5 : length(f) - 1] ?? '', /^\.?\//, '');
|
||||
// "-rw------- root/root 1234 2026-01-01 12:00:00 etc/config/dawnline"; links show "a -> b".
|
||||
if (substr(line, 0, 1) != '-' || index(line, ' -> ') >= 0 || index(line, ' link to ') >= 0)
|
||||
die(`Unexpected entry in backup: ${name}`);
|
||||
die(sprintf(_('Unexpected entry in backup: %s'), name));
|
||||
if (index(FILES, name) < 0)
|
||||
die(`Unexpected file in backup: ${name}`);
|
||||
die(sprintf(_('Unexpected file in backup: %s'), name));
|
||||
total += +(f[2] ?? 0) || 0;
|
||||
if (name == 'etc/config/dawnline')
|
||||
has_config = true;
|
||||
}
|
||||
if (!has_config)
|
||||
die('Backup does not contain /etc/config/dawnline.');
|
||||
die(_('Backup does not contain /etc/config/dawnline.'));
|
||||
if (total > MAX_UNPACKED)
|
||||
die('Backup is too large.');
|
||||
die(_('Backup is too large.'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -190,7 +191,7 @@ function install_files(dir) {
|
||||
for (let f in FILES) {
|
||||
let data = readfile(`${dir}/${f}`);
|
||||
if (data != null && !write_file(`/${f}`, data, 0o600))
|
||||
die(`Couldn't write /${f}. Is the flash full?`);
|
||||
die(sprintf(_("Couldn't write %s. Is the flash full?"), `/${f}`));
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
@@ -208,7 +209,7 @@ export function backup_restore(name, path) {
|
||||
try {
|
||||
let r = sh(`tar -xzf ${q(path)} -C ${q(dir)} ${join(' ', map(FILES, q))} 2>/dev/null; test -f ${q(dir + '/etc/config/dawnline')}`);
|
||||
if (r.code != 0)
|
||||
die('Not a valid backup archive.');
|
||||
die(_('Not a valid backup archive.'));
|
||||
check_config_dir(`${dir}/etc/config`);
|
||||
backup_create('pre-restore', name);
|
||||
install_files(dir);
|
||||
@@ -238,7 +239,7 @@ export function backup_read(name) {
|
||||
export function backup_upload(data_b64) {
|
||||
let data = b64dec(data_b64 ?? '');
|
||||
if (!data || length(data) > 4 * 1024 * 1024)
|
||||
die('Upload is empty or too large.');
|
||||
die(_('Upload is empty or too large.'));
|
||||
ensure_dir(RUN_DIR);
|
||||
let tmp = `${RUN_DIR}/upload.tar.gz`;
|
||||
write_file(tmp, data);
|
||||
@@ -273,23 +274,23 @@ export function export_json() {
|
||||
/** An export as /etc/config/dawnline text; dies on anything that is not one. */
|
||||
function export_to_uci(data) {
|
||||
if (type(data) != 'object' || data.format != 'dawnline' || type(data.sections) != 'array')
|
||||
die('Not a Dawnline export.');
|
||||
die(_('Not a Dawnline export.'));
|
||||
let types = { settings: true, server: true, person: true, device: true, service: true, circle: true };
|
||||
let esc = (x) => replace(`${x}`, "'", "'\\''");
|
||||
let lines = [];
|
||||
for (let s in data.sections) {
|
||||
if (type(s) != 'object' || !types[s['.type']] || !match(s['.name'] ?? '', /^[A-Za-z0-9_]{1,64}$/))
|
||||
die(`Invalid section ${s?.['.name']}.`);
|
||||
die(sprintf(_('Invalid section %s.'), s?.['.name']));
|
||||
push(lines, `config ${s['.type']} '${s['.name']}'`);
|
||||
for (let k, v in s) {
|
||||
if (substr(k, 0, 1) == '.')
|
||||
continue;
|
||||
if (!match(k, /^[a-z0-9_]{1,32}$/) || (type(v) != 'string' && type(v) != 'array'))
|
||||
die(`Invalid option ${k}.`);
|
||||
die(sprintf(_('Invalid option %s.'), k));
|
||||
if (type(v) == 'array')
|
||||
for (let x in v) {
|
||||
if (type(x) != 'string')
|
||||
die(`Invalid option ${k}.`);
|
||||
die(sprintf(_('Invalid option %s.'), k));
|
||||
push(lines, `\tlist ${k} '${esc(x)}'`);
|
||||
}
|
||||
else
|
||||
@@ -317,6 +318,6 @@ export function import_json(data) {
|
||||
let ok = write_file('/etc/config/dawnline', text, 0o600);
|
||||
unlock(l);
|
||||
if (!ok)
|
||||
die("Couldn't write /etc/config/dawnline. Is the flash full?");
|
||||
die(sprintf(_("Couldn't write %s. Is the flash full?"), '/etc/config/dawnline'));
|
||||
return apply.apply();
|
||||
};
|
||||
@@ -4,9 +4,10 @@
|
||||
|
||||
import { cursor } from 'uci';
|
||||
import {
|
||||
valid_name, valid_key, valid_host, valid_date, slugify, host_label, ucut, NAME_RULE, parse_cidr, cidr_overlaps, int2ip, ip2int,
|
||||
valid_name, valid_key, valid_host, valid_date, slugify, host_label, ucut, name_rule, parse_cidr, cidr_overlaps, int2ip, ip2int,
|
||||
rand_hex, rand_bytes, date_end, month_key, read_json, DATA_DIR, RUN_DIR, uniq
|
||||
} from 'dawnline.util';
|
||||
import { _, N_ } from 'dawnline.i18n';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as schema from 'dawnline.schema';
|
||||
import { policy as updates_policy } from 'dawnline.updates';
|
||||
@@ -481,35 +482,35 @@ export function new_code() {
|
||||
|
||||
export function create_person(c, m, a) {
|
||||
if (!valid_name(a.name))
|
||||
fail(NAME_RULE);
|
||||
fail(name_rule());
|
||||
// The id is a UCI section name: letters, digits and underscores only (a dash
|
||||
// makes uci drop the section). Repeated names get _2, _3, …
|
||||
let base = replace(a.slug ?? slugify(a.name), /-/g, '_');
|
||||
if (!match(base, /^[a-z0-9_]{1,32}$/))
|
||||
fail('The id may use lowercase letters, digits and underscores.');
|
||||
fail(_('The id may use lowercase letters, digits and underscores.'));
|
||||
// Any kind of section (store.id_taken, which imports this module).
|
||||
let taken = (id) => m.people[id] || m.servers[id] || m.devices[id] || m.services[id] || m.circles[id] ||
|
||||
index([ 'settings', 'main', 'global', 'defaults' ], id) >= 0;
|
||||
let slug = base;
|
||||
for (let n = 2; taken(slug); n++) {
|
||||
if (n > 99)
|
||||
fail(`"${base}" is already taken.`);
|
||||
fail(sprintf(_('"%s" is already taken.'), base));
|
||||
slug = `${substr(base, 0, 28)}_${n}`;
|
||||
}
|
||||
let srv_id = a.server ?? keys(m.servers)[0];
|
||||
if (!m.servers[srv_id])
|
||||
fail('Set up a server first.');
|
||||
fail(_('Set up a server first.'));
|
||||
let access = a.access ?? 'internet';
|
||||
if (index(ACCESS, access) < 0)
|
||||
fail('Access must be lan, internet or both.');
|
||||
fail(_('Access must be lan, internet or both.'));
|
||||
let limit = toint(a.device_limit, m.settings.default_device_limit);
|
||||
if (limit < 1 || limit > 32)
|
||||
fail('Device limit must be between 1 and 32.');
|
||||
fail(_('Device limit must be between 1 and 32.'));
|
||||
if (a.expires && !valid_date(a.expires))
|
||||
fail('End date must be YYYY-MM-DD.');
|
||||
fail(_('End date must be YYYY-MM-DD.'));
|
||||
let quota = num(a.quota_gb, 0);
|
||||
if (quota < 0 || quota > 100000)
|
||||
fail('Monthly data must be a positive number of GB.');
|
||||
fail(_('Monthly data must be a positive number of GB.'));
|
||||
|
||||
c.set(CONFIG, slug, 'person');
|
||||
c.set(CONFIG, slug, 'server', srv_id);
|
||||
@@ -535,52 +536,53 @@ export function create_person(c, m, a) {
|
||||
export function update_person(c, m, id, a) {
|
||||
let p = m.people[id];
|
||||
if (!p)
|
||||
fail('Unknown person.');
|
||||
fail(_('Unknown person.'));
|
||||
let set = (k, v) => (v == null || v == '') ? c.delete(CONFIG, id, k) : c.set(CONFIG, id, k, `${v}`);
|
||||
if (a.name != null) {
|
||||
if (!valid_name(a.name))
|
||||
fail(NAME_RULE);
|
||||
fail(name_rule());
|
||||
set('name', trim(a.name));
|
||||
}
|
||||
if (a.access != null) {
|
||||
if (index(ACCESS, a.access) < 0)
|
||||
fail('Access must be lan, internet or both.');
|
||||
fail(_('Access must be lan, internet or both.'));
|
||||
set('access', a.access);
|
||||
}
|
||||
if (a.device_limit != null) {
|
||||
let n = toint(a.device_limit, 0);
|
||||
if (n < 1 || n > 32)
|
||||
fail('Device limit must be between 1 and 32.');
|
||||
fail(_('Device limit must be between 1 and 32.'));
|
||||
let have = length(p.devices);
|
||||
if (n < have)
|
||||
fail(`${p.name} already has ${have} devices. Remove one first to lower the limit to ${n}.`);
|
||||
fail(sprintf(N_(have, '%s already has %d device. Remove one first to lower the limit to %d.',
|
||||
'%s already has %d devices. Remove one first to lower the limit to %d.'), p.name, have, n));
|
||||
set('device_limit', n);
|
||||
}
|
||||
if (a.expires != null) {
|
||||
if (a.expires != '' && !valid_date(a.expires))
|
||||
fail('End date must be YYYY-MM-DD.');
|
||||
fail(_('End date must be YYYY-MM-DD.'));
|
||||
set('expires', a.expires);
|
||||
}
|
||||
if (a.expire_action != null) {
|
||||
if (index([ 'pause', 'notify', 'remove' ], a.expire_action) < 0)
|
||||
fail('Unknown end action.');
|
||||
fail(_('Unknown end action.'));
|
||||
set('expire_action', a.expire_action == 'pause' ? '' : a.expire_action);
|
||||
}
|
||||
if (a.dns_mode != null) {
|
||||
if (index([ 'device', 'home' ], a.dns_mode) < 0)
|
||||
fail('Unknown DNS choice.');
|
||||
fail(_('Unknown DNS choice.'));
|
||||
set('dns_mode', a.dns_mode == 'device' ? '' : a.dns_mode);
|
||||
}
|
||||
if (a.expire_warn != null) {
|
||||
let n = toint(a.expire_warn, -1);
|
||||
if (n < 0 || n > 60)
|
||||
fail('Warning must be 0-60 days.');
|
||||
fail(_('Warning must be 0-60 days.'));
|
||||
set('expire_warn', n == 3 ? '' : n);
|
||||
}
|
||||
if (a.quota_gb != null) {
|
||||
let q = num(a.quota_gb, -1);
|
||||
if (a.quota_gb != '' && (q < 0 || q > 100000))
|
||||
fail('Data limit must be a positive number of GB.');
|
||||
fail(_('Data limit must be a positive number of GB.'));
|
||||
set('quota_gb', q > 0 ? q : '');
|
||||
}
|
||||
if (a.quota_period != null)
|
||||
@@ -588,13 +590,13 @@ export function update_person(c, m, id, a) {
|
||||
if (a.bonus_gb != null) {
|
||||
let b = num(a.bonus_gb, -1);
|
||||
if (b < 0 || b > 100000)
|
||||
fail('Extra data must be a positive number of GB.');
|
||||
fail(_('Extra data must be a positive number of GB.'));
|
||||
set('bonus_gb', b > 0 ? b : '');
|
||||
set('bonus_month', b > 0 ? month_key() : '');
|
||||
}
|
||||
if (a.hours != null) {
|
||||
if (a.hours != '' && !parse_hours(a.hours))
|
||||
fail('Hours must look like 07:00-23:00.');
|
||||
fail(_('Hours must look like 07:00-23:00.'));
|
||||
set('hours', a.hours);
|
||||
}
|
||||
if (a.note != null)
|
||||
@@ -602,7 +604,7 @@ export function update_person(c, m, id, a) {
|
||||
if (type(a.services) == 'array') {
|
||||
for (let sid in a.services)
|
||||
if (!m.services[sid])
|
||||
fail(`Unknown service ${sid}.`);
|
||||
fail(sprintf(_('Unknown service %s.'), sid));
|
||||
if (length(a.services))
|
||||
c.set(CONFIG, id, 'service', a.services);
|
||||
else
|
||||
@@ -611,7 +613,7 @@ export function update_person(c, m, id, a) {
|
||||
if (a.circle != null) {
|
||||
let ci = m.circles[a.circle];
|
||||
if (a.circle != '' && (!ci || ci.server != p.server))
|
||||
fail('Unknown circle.');
|
||||
fail(_('Unknown circle.'));
|
||||
set('circle', a.circle);
|
||||
}
|
||||
// Another server: every device gets an address in its tunnel (so each
|
||||
@@ -619,13 +621,13 @@ export function update_person(c, m, id, a) {
|
||||
// server's and go.
|
||||
if (a.server != null && a.server != '' && a.server != p.server) {
|
||||
if (!m.servers[a.server])
|
||||
fail('Unknown server.');
|
||||
fail(_('Unknown server.'));
|
||||
set('server', a.server);
|
||||
p.server = a.server;
|
||||
for (let did in p.devices) {
|
||||
let addr = alloc_address(m, m.servers[a.server]);
|
||||
if (!addr)
|
||||
fail(`No free address left on ${m.servers[a.server].name}.`);
|
||||
fail(sprintf(_('No free address left on %s.'), m.servers[a.server].name));
|
||||
m.devices[did].address = addr;
|
||||
c.set(CONFIG, did, 'address', addr);
|
||||
}
|
||||
@@ -652,29 +654,29 @@ export function create_device(c, m, person_id, name, kind, opts) {
|
||||
opts ??= {};
|
||||
let p = m.people[person_id];
|
||||
if (!p)
|
||||
fail('Unknown person.');
|
||||
fail(_('Unknown person.'));
|
||||
let srv = m.servers[p.server];
|
||||
if (!srv)
|
||||
fail('The person has no server.');
|
||||
fail(_('The person has no server.'));
|
||||
name = trim(name ?? '');
|
||||
if (!valid_name(name))
|
||||
fail('Enter a device name (up to 48 characters).');
|
||||
fail(_('Enter a device name (up to 48 characters).'));
|
||||
if (index(KINDS, kind) < 0)
|
||||
kind = 'other';
|
||||
if (opts.by == 'portal' && length(p.devices) >= p.device_limit)
|
||||
fail(`Device limit reached (${p.device_limit}).`);
|
||||
fail(sprintf(_('Device limit reached (%d).'), p.device_limit));
|
||||
for (let id in p.devices)
|
||||
if (lc(m.devices[id].name) == lc(name))
|
||||
fail(`"${name}" already exists.`);
|
||||
fail(sprintf(_('"%s" already exists.'), name));
|
||||
let addr = alloc_address(m, srv);
|
||||
if (!addr)
|
||||
fail('No free addresses left in the server subnet.');
|
||||
fail(_('No free addresses left in the server subnet.'));
|
||||
let k = opts.keys ?? {};
|
||||
if (!valid_key(k.public_key))
|
||||
fail('Key generation failed (is amneziawg-tools installed?).');
|
||||
fail(_('Key generation failed (is amneziawg-tools installed?).'));
|
||||
for (let o, d in m.devices)
|
||||
if (d.public_key == k.public_key)
|
||||
fail('This key is already in use.');
|
||||
fail(_('This key is already in use.'));
|
||||
|
||||
let id = `d_${rand_hex(4)}`;
|
||||
let dev = { id, person: person_id, name, kind, address: addr, public_key: k.public_key, private_key: k.private_key ?? '',
|
||||
@@ -699,13 +701,13 @@ export function create_device(c, m, person_id, name, kind, opts) {
|
||||
export function rename_device(c, m, id, name) {
|
||||
let d = m.devices[id];
|
||||
if (!d)
|
||||
fail('Unknown device.');
|
||||
fail(_('Unknown device.'));
|
||||
name = trim(name ?? '');
|
||||
if (!valid_name(name))
|
||||
fail('Enter a device name (up to 48 characters).');
|
||||
fail(_('Enter a device name (up to 48 characters).'));
|
||||
for (let o in m.people[d.person]?.devices ?? [])
|
||||
if (o != id && lc(m.devices[o].name) == lc(name))
|
||||
fail(`"${name}" already exists.`);
|
||||
fail(sprintf(_('"%s" already exists.'), name));
|
||||
c.set(CONFIG, id, 'name', name);
|
||||
d.name = name;
|
||||
};
|
||||
@@ -713,7 +715,7 @@ export function rename_device(c, m, id, name) {
|
||||
export function delete_device(c, m, id) {
|
||||
let d = m.devices[id];
|
||||
if (!d)
|
||||
fail('Unknown device.');
|
||||
fail(_('Unknown device.'));
|
||||
c.delete(CONFIG, id);
|
||||
let p = m.people[d.person];
|
||||
if (p)
|
||||
@@ -725,9 +727,9 @@ export function delete_device(c, m, id) {
|
||||
export function rotate_device(c, m, id, keys) {
|
||||
let d = m.devices[id];
|
||||
if (!d)
|
||||
fail('Unknown device.');
|
||||
fail(_('Unknown device.'));
|
||||
if (!valid_key(keys?.public_key) || !keys?.private_key)
|
||||
fail('Key generation failed.');
|
||||
fail(_('Key generation failed.'));
|
||||
c.set(CONFIG, id, 'private_key', keys.private_key);
|
||||
c.set(CONFIG, id, 'public_key', keys.public_key);
|
||||
if (keys.preshared_key)
|
||||
@@ -737,7 +739,7 @@ export function rotate_device(c, m, id, keys) {
|
||||
export function delete_person(c, m, id) {
|
||||
let p = m.people[id];
|
||||
if (!p)
|
||||
fail('Unknown person.');
|
||||
fail(_('Unknown person.'));
|
||||
for (let d in p.devices)
|
||||
c.delete(CONFIG, d);
|
||||
c.delete(CONFIG, id);
|
||||
@@ -757,20 +759,20 @@ export function private_cidr(c) {
|
||||
export function server_errors(m, srv, others_subnets) {
|
||||
let errs = [];
|
||||
if (!valid_ifname(srv.ifname))
|
||||
push(errs, 'Interface name: 1-12 lowercase letters, digits or _.');
|
||||
push(errs, _('Interface name: 1-12 lowercase letters, digits or _.'));
|
||||
if (srv.port < 1 || srv.port > 65535)
|
||||
push(errs, 'Port must be 1-65535.');
|
||||
push(errs, _('Port must be 1-65535.'));
|
||||
let c = parse_cidr(srv.subnet);
|
||||
if (!c)
|
||||
push(errs, 'Subnet must look like 10.77.0.0/24.');
|
||||
push(errs, _('Subnet must look like 10.77.0.0/24.'));
|
||||
else
|
||||
for (let o in others_subnets ?? []) {
|
||||
let oc = parse_cidr(o);
|
||||
if (oc && cidr_overlaps(c, oc))
|
||||
push(errs, `Subnet overlaps ${o}.`);
|
||||
push(errs, sprintf(_('Subnet overlaps %s.'), o));
|
||||
}
|
||||
if (srv.endpoint != '' && !valid_host(srv.endpoint))
|
||||
push(errs, 'Endpoint must be a hostname or IP address.');
|
||||
push(errs, _('Endpoint must be a hostname or IP address.'));
|
||||
return errs;
|
||||
};
|
||||
|
||||
@@ -788,52 +790,55 @@ export function model_errors(m) {
|
||||
let errs = [];
|
||||
let codes = {}, addrs = {};
|
||||
for (let id, p in m.people) {
|
||||
let who = `Person ${p.name}`;
|
||||
if (p.server != '' && !m.servers[p.server])
|
||||
push(errs, `${who}: server ${p.server} does not exist.`);
|
||||
push(errs, sprintf(_('Person %s: server %s does not exist.'), p.name, p.server));
|
||||
if (p.circle != '' && !m.circles[p.circle])
|
||||
push(errs, `${who}: circle ${p.circle} does not exist.`);
|
||||
push(errs, sprintf(_('Person %s: circle %s does not exist.'), p.name, p.circle));
|
||||
for (let sid in p.services)
|
||||
if (!m.services[sid])
|
||||
push(errs, `${who}: home service ${sid} does not exist.`);
|
||||
push(errs, sprintf(_('Person %s: home service %s does not exist.'), p.name, sid));
|
||||
if (p.code != '') {
|
||||
if (codes[p.code])
|
||||
push(errs, `${who}: has the same personal link as ${codes[p.code]}.`);
|
||||
push(errs, sprintf(_('Person %s: has the same personal link as %s.'), p.name, codes[p.code]));
|
||||
codes[p.code] = p.name;
|
||||
}
|
||||
}
|
||||
for (let id, d in m.devices) {
|
||||
let p = m.people[d.person];
|
||||
let who = `Device ${d.name}${p ? ` of ${p.name}` : ''}`;
|
||||
if (!p) {
|
||||
push(errs, `${who}: person ${d.person} does not exist.`);
|
||||
push(errs, sprintf(_('Device %s: person %s does not exist.'), d.name, d.person));
|
||||
continue;
|
||||
}
|
||||
let say = (msg, ...args) => push(errs, sprintf(msg, d.name, p.name, ...args));
|
||||
if (!valid_key(d.public_key))
|
||||
push(errs, `${who}: the public key is not a key.`);
|
||||
say(_('Device %s of %s: the public key is not a key.'));
|
||||
if (d.private_key != '' && !valid_key(d.private_key))
|
||||
push(errs, `${who}: the private key is not a key.`);
|
||||
say(_('Device %s of %s: the private key is not a key.'));
|
||||
if (d.preshared_key != '' && !valid_key(d.preshared_key))
|
||||
push(errs, `${who}: the preshared key is not a key.`);
|
||||
say(_('Device %s of %s: the preshared key is not a key.'));
|
||||
let n = ip2int(d.address);
|
||||
if (n == null) {
|
||||
push(errs, `${who}: address ${d.address || '(none)'} is not a plain IPv4 address.`);
|
||||
if (d.address)
|
||||
say(_('Device %s of %s: address %s is not a plain IPv4 address.'), d.address);
|
||||
else
|
||||
say(_('Device %s of %s: address (none) is not a plain IPv4 address.'));
|
||||
continue;
|
||||
}
|
||||
let srv = m.servers[p.server];
|
||||
let t = srv ? parse_cidr(srv.subnet) : null;
|
||||
if (t && (n < t.first || n > t.last))
|
||||
push(errs, `${who}: address ${d.address} is outside ${srv.name}'s tunnel ${srv.subnet}.`);
|
||||
say(_("Device %s of %s: address %s is outside %s's tunnel %s."), d.address, srv.name, srv.subnet);
|
||||
else if (t && n == t.first)
|
||||
push(errs, `${who}: address ${d.address} is the router's own address on ${srv.name}.`);
|
||||
say(_("Device %s of %s: address %s is the router's own address on %s."), d.address, srv.name);
|
||||
let key = `${p.server} ${d.address}`;
|
||||
if (addrs[key])
|
||||
push(errs, `${who}: address ${d.address} is also used by ${addrs[key]}.`);
|
||||
addrs[key] = who;
|
||||
let o = addrs[key];
|
||||
if (o)
|
||||
say(_('Device %s of %s: address %s is also used by device %s of %s.'), d.address, o.device, o.person);
|
||||
addrs[key] = { device: d.name, person: p.name };
|
||||
}
|
||||
for (let id, ci in m.circles)
|
||||
if (!m.servers[ci.server])
|
||||
push(errs, `Circle ${ci.name}: server ${ci.server} does not exist.`);
|
||||
push(errs, sprintf(_('Circle %s: server %s does not exist.'), ci.name, ci.server));
|
||||
return errs;
|
||||
};
|
||||
|
||||
@@ -854,7 +859,7 @@ export function renumber_server(c, m, srv, subnet) {
|
||||
for (let did in p.devices) {
|
||||
let addr = alloc_address(m, srv);
|
||||
if (!addr)
|
||||
fail(`${subnet} has no room for every device on ${srv.name}.`);
|
||||
fail(sprintf(_('%s has no room for every device on %s.'), subnet, srv.name));
|
||||
m.devices[did].address = addr;
|
||||
c.set(CONFIG, did, 'address', addr);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import * as awg from 'dawnline.awg';
|
||||
import * as apply from 'dawnline.apply';
|
||||
import * as live from 'dawnline.live';
|
||||
import * as store from 'dawnline.store';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/** AmneziaWG is on the router, so device keys can be made and loaded. */
|
||||
export function ready() {
|
||||
@@ -23,7 +24,8 @@ export function ready() {
|
||||
export function need_awg() {
|
||||
if (!awg.installed()) {
|
||||
let miss = awg.state().missing ?? [];
|
||||
die(`AmneziaWG is not installed${length(miss) ? ` (${join(', ', miss)})` : ''}: install it in Dawnline → Components.`);
|
||||
die(length(miss) ? sprintf(_('AmneziaWG is not installed (%s): install it in Dawnline → Components.'), join(', ', miss))
|
||||
: _('AmneziaWG is not installed: install it in Dawnline → Components.'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -31,9 +33,9 @@ export function need_awg() {
|
||||
function own(m, id, opts) {
|
||||
let d = m.devices[id];
|
||||
if (!d || (opts.person != null && d.person != opts.person))
|
||||
die(opts.person != null ? 'Device not found.' : 'Unknown device.');
|
||||
die(opts.person != null ? _('Device not found.') : _('Unknown device.'));
|
||||
if (opts.by == 'portal' && d.disabled)
|
||||
die('The admin has turned this device off.');
|
||||
die(_('The admin has turned this device off.'));
|
||||
return d;
|
||||
}
|
||||
|
||||
@@ -57,7 +59,7 @@ export function update(id, ch, opts) {
|
||||
opts ??= {};
|
||||
let by = opts.by ?? 'admin';
|
||||
if (ch.disabled != null && by != 'admin')
|
||||
die('Only the admin can turn devices off.');
|
||||
die(_('Only the admin can turn devices off.'));
|
||||
let d0 = store.transact((c, m) => {
|
||||
let d = own(m, id, opts);
|
||||
let was = { ...d };
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
import { stat, popen, access } from 'fs';
|
||||
import { q, read_json, write_json, ensure_dir, RUN_DIR } from 'dawnline.util';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/** Prefixes that fetch github.com files when GitHub itself is unreachable. */
|
||||
export const MIRRORS = [ 'https://ghfast.top/', 'https://gh-proxy.com/', 'https://ghproxy.net/' ];
|
||||
@@ -54,11 +55,11 @@ function api_json(url) {
|
||||
return null;
|
||||
}
|
||||
if (r.status == 403 || r.status == 429 || (type(j) == 'object' && match(j.message ?? '', /rate limit/i)))
|
||||
die('GitHub API rate limit reached: try again in an hour.');
|
||||
die(_('GitHub API rate limit reached: try again in an hour.'));
|
||||
if (r.status == 404)
|
||||
return null;
|
||||
if (r.status >= 400)
|
||||
die(`GitHub: ${j?.message ?? `HTTP ${r.status}`}`);
|
||||
die(sprintf(_('GitHub: %s'), j?.message ?? `HTTP ${r.status}`));
|
||||
return j;
|
||||
}
|
||||
|
||||
@@ -209,18 +210,18 @@ export function download(url, dest, o) {
|
||||
for (let i, u in tries) {
|
||||
let host = replace(u, /^https:\/\/([^\/]+)\/.*$/, '$1');
|
||||
if (i > 0)
|
||||
o.log?.(`Trying mirror ${host}`);
|
||||
o.log?.(sprintf(_('Trying mirror %s'), host));
|
||||
let r = have_curl()
|
||||
? run(`curl -fsSL --connect-timeout 15 --max-time 300 --retry 1 -o ${q(dest)} ${q(u)}`)
|
||||
: run(`uclient-fetch -q -T 30 -O ${q(dest)} ${q(u)}`);
|
||||
if (r.code == 0 && (stat(dest)?.size ?? 0) > 0) {
|
||||
if (!want || sha256(dest) == want)
|
||||
return u;
|
||||
o.log?.(`Warning: ${host} sent a file that does not match GitHub's sha256, discarded`);
|
||||
o.log?.(sprintf(_("Warning: %s sent a file that does not match GitHub's sha256, discarded"), host));
|
||||
}
|
||||
system(`rm -f ${q(dest)}`);
|
||||
if (i == 0 && length(tries) > 1)
|
||||
o.log?.('GitHub did not answer, trying mirrors');
|
||||
o.log?.(_('GitHub did not answer, trying mirrors'));
|
||||
}
|
||||
return null;
|
||||
};
|
||||
@@ -1,8 +1,10 @@
|
||||
// Dawnline — Health: what the router has and lacks (packages, listeners,
|
||||
// networks), the checks shown on Diagnostics → Health, and their fixes.
|
||||
// The checks' texts are in the language of the call (dawnline.i18n).
|
||||
|
||||
import { readfile, stat, lsdir } from 'fs';
|
||||
import { cursor } from 'uci';
|
||||
import { _, N_ } from 'dawnline.i18n';
|
||||
import { q, sh, sh_out, parse_cidr, cidr_overlaps, ip2int, in_cidr, file_exists, cloudflare_ip } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as live from 'dawnline.live';
|
||||
@@ -174,43 +176,12 @@ export function foreign_subnets() {
|
||||
|
||||
/*
|
||||
* Checks are named for the healthy state ("Clock is set"); a failed one also
|
||||
* gets the problem in words for notices ("Clock isn't set"). Longest names
|
||||
* first; a server's name after the check name is kept.
|
||||
* gets the problem in words for notices ("Clock isn't set"), passed with it.
|
||||
* A server's checks carry its name after both (` (Home)`, with several servers).
|
||||
*/
|
||||
const PROBLEM = [
|
||||
[ 'AmneziaWG answers reach devices', 'AmneziaWG answers may not reach devices' ],
|
||||
[ 'AmneziaWG devices loaded', 'Not every device is loaded into AmneziaWG' ],
|
||||
[ 'AmneziaWG subnet is unique', 'AmneziaWG subnet overlaps another network' ],
|
||||
[ 'AmneziaWG port is free', 'AmneziaWG port is taken' ],
|
||||
[ 'AmneziaWG installed', 'AmneziaWG isn’t ready' ],
|
||||
[ 'AmneziaWG firewall', 'AmneziaWG firewall rules are missing' ],
|
||||
[ 'AmneziaWG running', 'AmneziaWG is down' ],
|
||||
[ 'Portal answers reach visitors', 'Portal answers may not reach visitors' ],
|
||||
[ 'Portal address points here', 'Portal address doesn’t point here' ],
|
||||
[ 'Portal address', 'Portal address isn’t set' ],
|
||||
[ 'Portal certificate', 'Portal certificate needs attention' ],
|
||||
[ 'Personal portal', 'Personal portal isn’t working' ],
|
||||
[ 'Plain HTTP links', 'Portal links use plain HTTP' ],
|
||||
[ 'Internet like a home device', 'Internet like a home device isn’t working' ],
|
||||
[ 'DNS for Home-only devices', 'DNS for Home-only devices isn’t working' ],
|
||||
[ 'Background agent running', 'Background agent isn’t running' ],
|
||||
[ 'Access rules loaded', 'Access rules aren’t loaded' ],
|
||||
[ 'Server configured', 'No server yet' ],
|
||||
[ 'Public address', 'Public address needs attention' ],
|
||||
[ 'Clock is set', 'Clock isn’t set' ],
|
||||
];
|
||||
|
||||
function problem_of(title) {
|
||||
for (let p in PROBLEM)
|
||||
if (substr(title, 0, length(p[0])) == p[0])
|
||||
return p[1] + substr(title, length(p[0]));
|
||||
return title;
|
||||
}
|
||||
|
||||
/** problem: the failed check in words, when the table's wording does not fit the case. */
|
||||
function check(id, title, status, detail, fix, problem) {
|
||||
let bad = status == 'warn' || status == 'error';
|
||||
return { id, title, status, detail: detail ?? '', fix: fix ?? null, problem: bad ? (problem ?? problem_of(title)) : null };
|
||||
return { id, title, status, detail: detail ?? '', fix: fix ?? null, problem: bad ? (problem ?? title) : null };
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -222,13 +193,14 @@ function replies(m) {
|
||||
return { ok: fw.reply_ok(m, d), diverts: map(d, fw.divert_str) };
|
||||
}
|
||||
|
||||
function reply_check(id, title, proto, port, r) {
|
||||
function reply_check(id, title, problem, proto, port, r) {
|
||||
let via = join(', ', r.diverts);
|
||||
let from = `${uc(proto)} ${port}`;
|
||||
return check(id, title, r.ok ? 'ok' : 'error',
|
||||
!r.ok ? `Answers from ${uc(proto)} ${port} are swallowed by a proxy on the router (${via}): clients get no reply.`
|
||||
: length(r.diverts) ? `Answers from ${uc(proto)} ${port} go straight out. A proxy on the router diverts its own traffic (${via}); these answers skip it.`
|
||||
: `Answers from ${uc(proto)} ${port} go straight out.`,
|
||||
r.ok ? null : 'apply');
|
||||
!r.ok ? sprintf(_('Answers from %s are swallowed by a proxy on the router (%s): clients get no reply.'), from, via)
|
||||
: length(r.diverts) ? sprintf(_('Answers from %s go straight out. A proxy on the router diverts its own traffic (%s); these answers skip it.'), from, via)
|
||||
: sprintf(_('Answers from %s go straight out.'), from),
|
||||
r.ok ? null : 'apply', problem);
|
||||
}
|
||||
|
||||
const PRIVATE = map([ '100.64.0.0/10', '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16' ], parse_cidr);
|
||||
@@ -260,29 +232,36 @@ export function endpoint_facts(srv, host) {
|
||||
};
|
||||
};
|
||||
|
||||
/** The facts in words: { status: ok|warn|error, text }. `proto_note` names what must get through ("UDP 4500"). */
|
||||
/**
|
||||
* The facts in words, in the language of the call: { status: ok|warn|error, text }
|
||||
* (text a whole sentence). `proto_note` names what must get through ("UDP 4500").
|
||||
*/
|
||||
export function endpoint_words(f, proto_note) {
|
||||
if (!f.host)
|
||||
return { status: 'error', text: 'No public address: devices will not know where to connect.' };
|
||||
return { status: 'error', text: _('No public address: devices will not know where to connect.') };
|
||||
if (!length(f.ips))
|
||||
return { status: 'error', text: `${f.host} does not resolve.` };
|
||||
return { status: 'error', text: sprintf(_('%s does not resolve.'), f.host) };
|
||||
if (f.cloudflare)
|
||||
return { status: 'error', text: `${f.host} → ${join(', ', f.ips)} (Cloudflare). ${proto_note} reaches the router only if this name is DNS-only there, or use the router's IP.` };
|
||||
return { status: 'error', text: sprintf(_("%s → %s (Cloudflare). %s reaches the router only if this name is DNS-only there, or use the router's IP."),
|
||||
f.host, join(', ', f.ips), proto_note) };
|
||||
if (f.v6_only)
|
||||
return { status: f.kind == 'public' ? 'warn' : 'ok', text: `${f.host} → ${join(', ', f.ips6)}: IPv6 only, so only devices with IPv6 connect${f.kind == 'public' ? ` (the router's IPv4 ${f.wan} has no name)` : ''}.` };
|
||||
return { status: f.kind == 'public' ? 'warn' : 'ok', text: f.kind == 'public'
|
||||
? sprintf(_("%s → %s: IPv6 only, so only devices with IPv6 connect (the router's IPv4 %s has no name)."), f.host, join(', ', f.ips6), f.wan)
|
||||
: sprintf(_('%s → %s: IPv6 only, so only devices with IPv6 connect.'), f.host, join(', ', f.ips6)) };
|
||||
if (f.kind == 'cgnat' || f.kind == 'private')
|
||||
return { status: 'warn', text: f.kind == 'cgnat'
|
||||
? `The WAN address ${f.wan} is CGNAT (shared by the ISP): ${proto_note} cannot be forwarded to this router from outside unless the ISP gives a public address or IPv6.`
|
||||
: `The WAN address ${f.wan} is private: this router is behind another one. Forward ${proto_note} on it, or devices cannot connect.` };
|
||||
? sprintf(_('The WAN address %s is CGNAT (shared by the ISP): %s cannot be forwarded to this router from outside unless the ISP gives a public address or IPv6.'), f.wan, proto_note)
|
||||
: sprintf(_('The WAN address %s is private: this router is behind another one. Forward %s on it, or devices cannot connect.'), f.wan, proto_note) };
|
||||
if (f.wan && !f.here)
|
||||
return { status: 'warn', text: `${f.host} points at ${join(', ', f.ips4)}, not this router (WAN ${f.wan}). Check your DNS / DDNS.` };
|
||||
return { status: 'ok', text: f.here ? `${f.host} points at this router (${f.wan}).` : `${f.host} → ${join(', ', f.ips)}` };
|
||||
return { status: 'warn', text: sprintf(_('%s points at %s, not this router (WAN %s). Check your DNS / DDNS.'), f.host, join(', ', f.ips4), f.wan) };
|
||||
// Without the router's WAN address only the facts: names and addresses, no words.
|
||||
return { status: 'ok', text: f.here ? sprintf(_('%s points at this router (%s).'), f.host, f.wan) : `${f.host} → ${join(', ', f.ips)}` };
|
||||
};
|
||||
|
||||
/** What a public address resolves to and whether that reaches this router (for a core's protocol). */
|
||||
function endpoint_check(id, title, srv, host, proto_note) {
|
||||
function endpoint_check(id, title, problem, srv, host, proto_note) {
|
||||
let w = endpoint_words(endpoint_facts(srv, host), proto_note);
|
||||
return check(id, title, w.status, w.text);
|
||||
return check(id, title, w.status, w.text, null, problem);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -306,7 +285,9 @@ function policy_routing() {
|
||||
return out;
|
||||
}
|
||||
|
||||
const NO_PROTO = "netifd doesn't know the amneziawg protocol (AmneziaWG missing, or the network wasn't restarted after installing it).";
|
||||
function no_proto() {
|
||||
return _("netifd doesn't know the amneziawg protocol (AmneziaWG missing, or the network wasn't restarted after installing it).");
|
||||
}
|
||||
|
||||
/** Free space on the overlay in KB (null when unknown). */
|
||||
function overlay_free_kb() {
|
||||
@@ -318,27 +299,29 @@ function overlay_free_kb() {
|
||||
/** Is AmneziaWG there and usable: packages, kernel module, netifd's protocol handler. */
|
||||
function awg_check() {
|
||||
let st = awg.load();
|
||||
let title = 'AmneziaWG installed';
|
||||
if (length(st.missing ?? [])) {
|
||||
let title = _('AmneziaWG installed');
|
||||
let missing = st.missing ?? [];
|
||||
if (length(missing)) {
|
||||
// The module was built for the kernel of the firmware it was installed on.
|
||||
let kc = builds.kernel_changed();
|
||||
if (kc && index(st.missing, 'kmod-amneziawg') >= 0)
|
||||
if (kc && index(missing, 'kmod-amneziawg') >= 0)
|
||||
return check('awg', title, 'error',
|
||||
`The firmware changed (kernel ${kc.was} → ${kc.now}): the AmneziaWG build installed for it is gone. Install the build for this firmware.`,
|
||||
'install:awg', 'AmneziaWG needs a build for the new firmware');
|
||||
return check('awg', title, 'error', `${join(' and ', st.missing)} ${length(st.missing) == 1 ? 'is' : 'are'} missing.`, 'install:awg',
|
||||
'AmneziaWG isn’t installed');
|
||||
sprintf(_('The firmware changed (kernel %s → %s): the AmneziaWG build installed for it is gone. Install the build for this firmware.'), kc.was, kc.now),
|
||||
'install:awg', _('AmneziaWG needs a build for the new firmware'));
|
||||
return check('awg', title, 'error', sprintf(N_(length(missing), '%s is missing.', '%s are missing.'), join(', ', missing)), 'install:awg',
|
||||
_('AmneziaWG isn’t installed'));
|
||||
}
|
||||
if (!st.loaded) {
|
||||
// load() tried it: the second modprobe only repeats why.
|
||||
let why = trim(sh('modprobe amneziawg 2>&1; dmesg | grep -i amneziawg | tail -n 3').out);
|
||||
return check('awg', title, 'error',
|
||||
`The kernel module doesn't load${why ? `: ${why}` : '.'} Reinstall a build for this kernel in Components.`, 'updates',
|
||||
'AmneziaWG’s kernel module doesn’t load');
|
||||
why ? sprintf(_("The kernel module doesn't load: %s Reinstall a build for this kernel in Components."), why)
|
||||
: _("The kernel module doesn't load. Reinstall a build for this kernel in Components."),
|
||||
'updates', _('AmneziaWG’s kernel module doesn’t load'));
|
||||
}
|
||||
if (!st.handler)
|
||||
return check('awg', title, 'error', NO_PROTO, 'netrestart', 'The network doesn’t know AmneziaWG yet');
|
||||
return check('awg', title, 'ok', 'Kernel module, awg tool and the netifd protocol are present.');
|
||||
return check('awg', title, 'error', no_proto(), 'netrestart', _('The network doesn’t know AmneziaWG yet'));
|
||||
return check('awg', title, 'ok', _('Kernel module, awg tool and the netifd protocol are present.'));
|
||||
}
|
||||
|
||||
/** Checks of a server's AmneziaWG tunnel. */
|
||||
@@ -347,13 +330,15 @@ function awg_checks(m, id, srv, label, fwc, dmp, rep) {
|
||||
let st = live.iface_status(srv.ifname);
|
||||
let up = !!st?.up;
|
||||
let codes = map(st?.errors ?? [], (e) => e.code);
|
||||
let running = _('AmneziaWG running') + label, down = _('AmneziaWG is down') + label;
|
||||
if (!up && index(codes, 'INVALID_PROTO') >= 0)
|
||||
push(out, check(`up_${id}`, `AmneziaWG running${label}`, 'error', NO_PROTO, 'netrestart'));
|
||||
push(out, check(`up_${id}`, running, 'error', no_proto(), 'netrestart', down));
|
||||
else
|
||||
push(out, check(`up_${id}`, `AmneziaWG running${label}`, up ? 'ok' : 'error',
|
||||
up ? `${srv.ifname} is up, listening on UDP ${srv.port}.` :
|
||||
(st ? `${srv.ifname} is down${length(codes) ? ': ' + join(', ', codes) : ''}.` : `${srv.ifname} does not exist.`),
|
||||
up ? null : (st ? 'ifup:' + srv.ifname : 'apply')));
|
||||
push(out, check(`up_${id}`, running, up ? 'ok' : 'error',
|
||||
up ? sprintf(_('%s is up, listening on UDP %d.'), srv.ifname, srv.port) :
|
||||
!st ? sprintf(_('%s does not exist.'), srv.ifname) :
|
||||
length(codes) ? sprintf(_('%s is down: %s.'), srv.ifname, join(', ', codes)) : sprintf(_('%s is down.'), srv.ifname),
|
||||
up ? null : (st ? 'ifup:' + srv.ifname : 'apply'), down));
|
||||
if (up) {
|
||||
// By key, not by count: a stale peer standing in for a missing one would
|
||||
// make the numbers match.
|
||||
@@ -375,17 +360,20 @@ function awg_checks(m, id, srv, label, fwc, dmp, rep) {
|
||||
let missing = length(filter(keys(wanted), (k) => !loaded[k]));
|
||||
let extra = length(filter(keys(loaded), (k) => !wanted[k]));
|
||||
let same = !missing && !extra;
|
||||
push(out, check(`peers_${id}`, `AmneziaWG devices loaded${label}`, same ? 'ok' : 'warn',
|
||||
same ? `${actual} device${actual == 1 ? ' is' : 's are'} loaded in the tunnel.` :
|
||||
`${missing} of ${expected} device${expected == 1 ? '' : 's'} missing${extra ? `, ${extra} loaded that should not be` : ''}.`,
|
||||
same ? null : 'sync'));
|
||||
push(out, check(`peers_${id}`, _('AmneziaWG devices loaded') + label, same ? 'ok' : 'warn',
|
||||
same ? sprintf(N_(actual, '%d device is loaded in the tunnel.', '%d devices are loaded in the tunnel.'), actual) :
|
||||
extra ? sprintf(N_(expected, '%d of %d device missing, %d loaded that should not be.', '%d of %d devices missing, %d loaded that should not be.'),
|
||||
missing, expected, extra)
|
||||
: sprintf(N_(expected, '%d of %d device missing.', '%d of %d devices missing.'), missing, expected),
|
||||
same ? null : 'sync', _('Not every device is loaded into AmneziaWG') + label));
|
||||
}
|
||||
let rule = fwc.get('firewall', `dawnline_${id}_port`) == 'rule';
|
||||
let zone = fwc.get('firewall', `dawnline_${id}_zone`) == 'zone';
|
||||
push(out, check(`fw_${id}`, `AmneziaWG firewall${label}`, rule && zone ? 'ok' : 'error',
|
||||
rule && zone ? `Zone ${srv.ifname} and the WAN rule for UDP ${srv.port} exist.` : 'Firewall zone or WAN rule is missing.',
|
||||
rule && zone ? null : 'apply'));
|
||||
push(out, reply_check(`reply_${id}`, `AmneziaWG answers reach devices${label}`, 'udp', srv.port, rep));
|
||||
push(out, check(`fw_${id}`, _('AmneziaWG firewall') + label, rule && zone ? 'ok' : 'error',
|
||||
rule && zone ? sprintf(_('Zone %s and the WAN rule for UDP %d exist.'), srv.ifname, srv.port) : _('Firewall zone or WAN rule is missing.'),
|
||||
rule && zone ? null : 'apply', _('AmneziaWG firewall rules are missing') + label));
|
||||
push(out, reply_check(`reply_${id}`, _('AmneziaWG answers reach devices') + label, _('AmneziaWG answers may not reach devices') + label,
|
||||
'udp', srv.port, rep));
|
||||
// Port collisions with other tunnels.
|
||||
let clash = [];
|
||||
let nc = cursor();
|
||||
@@ -395,7 +383,8 @@ function awg_checks(m, id, srv, label, fwc, dmp, rep) {
|
||||
push(clash, s['.name']);
|
||||
});
|
||||
if (length(clash))
|
||||
push(out, check(`port_${id}`, `AmneziaWG port is free${label}`, 'error', `UDP ${srv.port} is also used by ${join(', ', clash)}.`));
|
||||
push(out, check(`port_${id}`, _('AmneziaWG port is free') + label, 'error', sprintf(_('UDP %d is also used by %s.'), srv.port, join(', ', clash)),
|
||||
null, _('AmneziaWG port is taken') + label));
|
||||
let overlaps = [];
|
||||
let sc = parse_cidr(srv.subnet);
|
||||
for (let o in other_subnets(id)) {
|
||||
@@ -403,8 +392,9 @@ function awg_checks(m, id, srv, label, fwc, dmp, rep) {
|
||||
if (sc && oc && cidr_overlaps(sc, oc))
|
||||
push(overlaps, `${o.iface} (${o.cidr})`);
|
||||
}
|
||||
push(out, check(`subnet_${id}`, `AmneziaWG subnet is unique${label}`, length(overlaps) ? 'error' : 'ok',
|
||||
length(overlaps) ? `${srv.subnet} overlaps ${join(', ', overlaps)}.` : `${srv.subnet} does not overlap other networks.`));
|
||||
push(out, check(`subnet_${id}`, _('AmneziaWG subnet is unique') + label, length(overlaps) ? 'error' : 'ok',
|
||||
length(overlaps) ? sprintf(_('%s overlaps %s.'), srv.subnet, join(', ', overlaps)) : sprintf(_('%s does not overlap other networks.'), srv.subnet),
|
||||
null, _('AmneziaWG subnet overlaps another network') + label));
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -412,50 +402,59 @@ function awg_checks(m, id, srv, label, fwc, dmp, rep) {
|
||||
function portal_checks(m, need, rep) {
|
||||
let out = [];
|
||||
let s = m.settings;
|
||||
let portal = _('Personal portal'), portal_bad = _('Personal portal isn’t working');
|
||||
if (length(need.https))
|
||||
return [ check('portal', 'Personal portal', 'error', `HTTPS isn't available on this router: install ${join(' and ', need.https)}.`, 'install:https') ];
|
||||
return [ check('portal', portal, 'error', sprintf(_("HTTPS isn't available on this router: install %s."), join(', ', need.https)), 'install:https', portal_bad) ];
|
||||
let owners = tcp_port_owners(s.portal_port);
|
||||
let listening = tcp_listening(s.portal_port);
|
||||
if (length(owners))
|
||||
push(out, check('portal', 'Personal portal', 'error',
|
||||
`TCP ${s.portal_port} is already used by ${join(', ', owners)}. Choose another port in Settings.`));
|
||||
push(out, check('portal', portal, 'error',
|
||||
sprintf(_('TCP %d is already used by %s. Choose another port in Settings.'), s.portal_port, join(', ', owners)), null, portal_bad));
|
||||
else
|
||||
push(out, check('portal', 'Personal portal', listening ? 'ok' : 'error',
|
||||
listening ? `Listening on TCP ${s.portal_port}.` : `Nothing listens on TCP ${s.portal_port}.`, listening ? null : 'restart'));
|
||||
push(out, check('portal', portal, listening ? 'ok' : 'error',
|
||||
listening ? sprintf(_('Listening on TCP %d.'), s.portal_port) : sprintf(_('Nothing listens on TCP %d.'), s.portal_port),
|
||||
listening ? null : 'restart', portal_bad));
|
||||
if (!s.portal_host)
|
||||
push(out, check('portal_host', 'Portal address', 'error', 'Set the public hostname in Settings so links can be generated.'));
|
||||
push(out, check('portal_host', _('Portal address'), 'error', _('Set the public hostname in Settings so links can be generated.'),
|
||||
null, _('Portal address isn’t set')));
|
||||
else {
|
||||
let ips = lookup.resolve(s.portal_host), wan = lookup.router_wan(m);
|
||||
let cf = filter(ips, (x) => cloudflare_ip(x));
|
||||
push(out, check('portal_dns', 'Portal address points here', !length(ips) ? 'error' : length(cf) ? 'ok' : wan && index(ips, wan) < 0 ? 'warn' : 'ok',
|
||||
!length(ips) ? `${s.portal_host} does not resolve.` :
|
||||
length(cf) ? `${s.portal_host} goes through Cloudflare; in Russia such connections often stall after ~16 KB.` :
|
||||
wan && index(ips, wan) < 0 ? `${s.portal_host} points at ${join(', ', ips)}, not this router (${wan}).` :
|
||||
`${s.portal_host} → ${join(', ', ips)}${wan ? ' (this router)' : ''}.`));
|
||||
let h = s.portal_host;
|
||||
push(out, check('portal_dns', _('Portal address points here'), !length(ips) ? 'error' : length(cf) ? 'ok' : wan && index(ips, wan) < 0 ? 'warn' : 'ok',
|
||||
!length(ips) ? sprintf(_('%s does not resolve.'), h) :
|
||||
length(cf) ? sprintf(_('%s goes through Cloudflare; in Russia such connections often stall after ~16 KB.'), h) :
|
||||
wan && index(ips, wan) < 0 ? sprintf(_('%s points at %s, not this router (%s).'), h, join(', ', ips), wan) :
|
||||
wan ? sprintf(_('%s → %s (this router).'), h, join(', ', ips)) : `${h} → ${join(', ', ips)}.`,
|
||||
null, _('Portal address doesn’t point here')));
|
||||
}
|
||||
push(out, reply_check('portal_reply', 'Portal answers reach visitors', 'tcp', s.portal_port, rep));
|
||||
push(out, reply_check('portal_reply', _('Portal answers reach visitors'), _('Portal answers may not reach visitors'), 'tcp', s.portal_port, rep));
|
||||
if (core.portal_http(m)) {
|
||||
let ipl = filter(core.portal_hosts(m), (h) => ip2int(h) != null);
|
||||
push(out, check('portal_http', 'Plain HTTP links', 'warn',
|
||||
`Links on ${join(', ', ipl)} use plain HTTP: the link and the VPN keys in configurations travel unencrypted.`));
|
||||
push(out, check('portal_http', _('Plain HTTP links'), 'warn',
|
||||
sprintf(_('Links on %s use plain HTTP: the link and the VPN keys in configurations travel unencrypted.'), join(', ', ipl)),
|
||||
null, _('Portal links use plain HTTP')));
|
||||
}
|
||||
if (ip2int(s.portal_host) != null) {
|
||||
push(out, check('cert', 'Portal certificate', 'skip', 'The main address is an IP: its links use plain HTTP.'));
|
||||
push(out, check('cert', _('Portal certificate'), 'skip', _('The main address is an IP: its links use plain HTTP.')));
|
||||
return out;
|
||||
}
|
||||
let cert = pc.portal_cert(s);
|
||||
let ok = system(`openssl x509 -checkend 1209600 -noout -in ${q(cert.cert)} >/dev/null 2>&1`) == 0;
|
||||
let sans = cert.self_signed ? [] : pc.cert_names(cert.cert);
|
||||
let covers = !s.portal_host || cert.self_signed || length(filter(sans, (n) => pc.name_covers(n, s.portal_host))) > 0;
|
||||
push(out, check('cert', 'Portal certificate', cert.self_signed || !ok || !covers ? 'warn' : 'ok',
|
||||
cert.self_signed ? `Using a self-signed certificate: browsers will show a warning.${length(need.acme) ? ' ACME can get a free Let’s Encrypt one.' : ''}` :
|
||||
!covers ? `${cert.cert} does not cover ${s.portal_host} (it has ${join(', ', sans)}): browsers will warn.` :
|
||||
ok ? `${cert.cert} covers ${s.portal_host} and is valid for more than 14 days.` : `${cert.cert} expires within 14 days.`));
|
||||
push(out, check('cert', _('Portal certificate'), cert.self_signed || !ok || !covers ? 'warn' : 'ok',
|
||||
cert.self_signed ? (length(need.acme) ? _('Using a self-signed certificate: browsers will show a warning. ACME can get a free Let’s Encrypt one.')
|
||||
: _('Using a self-signed certificate: browsers will show a warning.')) :
|
||||
!covers ? sprintf(_('%s does not cover %s (it has %s): browsers will warn.'), cert.cert, s.portal_host, join(', ', sans)) :
|
||||
ok ? sprintf(_('%s covers %s and is valid for more than 14 days.'), cert.cert, s.portal_host) : sprintf(_('%s expires within 14 days.'), cert.cert),
|
||||
null, _('Portal certificate needs attention')));
|
||||
return out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Run all checks. Each result: { id, title, status: ok|warn|error|skip, detail, fix }.
|
||||
* Run all checks. Each result: { id, title, status: ok|warn|error|skip, detail, fix,
|
||||
* problem (a failed check in words, else null) }, the texts in the language of the call.
|
||||
* `fix` names an action accepted by fix(), or one the UI handles itself
|
||||
* (install:<feature>, updates).
|
||||
*/
|
||||
@@ -469,46 +468,50 @@ export function health(m) {
|
||||
if (length(m.servers))
|
||||
push(out, awg_check());
|
||||
let y = localtime().year;
|
||||
push(out, check('clock', 'Clock is set', y >= 2025 ? 'ok' : 'error',
|
||||
y >= 2025 ? 'End dates and quotas use the router clock.' : 'The router clock looks wrong; end dates will misbehave. Check NTP.'));
|
||||
push(out, check('clock', _('Clock is set'), y >= 2025 ? 'ok' : 'error',
|
||||
y >= 2025 ? _('End dates and quotas use the router clock.') : _('The router clock looks wrong; end dates will misbehave. Check NTP.'),
|
||||
null, _('Clock isn’t set')));
|
||||
|
||||
let agent = service_running('dawnline', 'agent');
|
||||
push(out, check('agent', 'Background agent running', agent ? 'ok' : 'error',
|
||||
'Counts traffic and enforces end dates and quotas.', agent ? null : 'restart'));
|
||||
push(out, check('agent', _('Background agent running'), agent ? 'ok' : 'error',
|
||||
_('Counts traffic and enforces end dates and quotas.'), agent ? null : 'restart', _('Background agent isn’t running')));
|
||||
|
||||
// A full overlay fails every config write on the router, Dawnline's and
|
||||
// OpenWrt's own; backups and history are what Dawnline adds to it.
|
||||
let free = overlay_free_kb();
|
||||
if (free != null)
|
||||
push(out, check('flash', 'Free space on the router', free < 512 ? 'error' : free < 2048 ? 'warn' : 'ok',
|
||||
free < 2048 ? `${int(free / 1024 * 10) / 10} MB free: settings may stop saving. Remove old backups (Settings → Backups) or shorten the history.`
|
||||
: `${int(free / 1024)} MB free on the overlay.`,
|
||||
null, 'The router is running out of flash'));
|
||||
push(out, check('flash', _('Free space on the router'), free < 512 ? 'error' : free < 2048 ? 'warn' : 'ok',
|
||||
free < 2048 ? sprintf(_('%s MB free: settings may stop saving. Remove old backups (Settings → Backups) or shorten the history.'), int(free / 1024 * 10) / 10)
|
||||
: sprintf(_('%d MB free on the overlay.'), int(free / 1024)),
|
||||
null, _('The router is running out of flash')));
|
||||
|
||||
if (!length(m.servers)) {
|
||||
push(out, check('server', 'Server configured', 'warn', 'Run the setup wizard on the Server tab.'));
|
||||
push(out, check('server', _('Server configured'), 'warn', _('Run the setup wizard on the Server tab.'), null, _('No server yet')));
|
||||
return out;
|
||||
}
|
||||
|
||||
let nft_ok = system('nft list table inet dawnline >/dev/null 2>&1') == 0;
|
||||
push(out, check('nft', 'Access rules loaded', nft_ok ? 'ok' : 'error',
|
||||
nft_ok ? 'Table inet dawnline enforces who may reach LAN and the internet.'
|
||||
: 'Table inet dawnline is missing: no device is loaded into the tunnels until it is back.',
|
||||
nft_ok ? null : 'apply'));
|
||||
push(out, check('nft', _('Access rules loaded'), nft_ok ? 'ok' : 'error',
|
||||
nft_ok ? _('Table inet dawnline enforces who may reach LAN and the internet.')
|
||||
: _('Table inet dawnline is missing: no device is loaded into the tunnels until it is back.'),
|
||||
nft_ok ? null : 'apply', _('Access rules aren’t loaded')));
|
||||
|
||||
if (length(filter(values(m.servers), (s) => s.lan_like && s.enabled))) {
|
||||
let pr = policy_routing();
|
||||
push(out, check('policy', 'Internet like a home device not bypassed', length(pr) ? 'warn' : 'ok',
|
||||
length(pr) ? `Policy routing on the router (${join('; ', pr)}) sends marked traffic straight out, past the home-device path: tunnel traffic it matches skips your LAN's proxies and filters.`
|
||||
: 'No other policy routing ahead of the tunnel rules.',
|
||||
null, 'Other policy routing bypasses the home-device path'));
|
||||
push(out, check('policy', _('Internet like a home device not bypassed'), length(pr) ? 'warn' : 'ok',
|
||||
length(pr) ? sprintf(_("Policy routing on the router (%s) sends marked traffic straight out, past the home-device path: tunnel traffic it matches skips your LAN's proxies and filters."), join('; ', pr))
|
||||
: _('No other policy routing ahead of the tunnel rules.'),
|
||||
null, _('Other policy routing bypasses the home-device path')));
|
||||
}
|
||||
|
||||
// A device the sync has to leave out (a merged import, a hand-edited config).
|
||||
// Its sentences (core.model_errors), how many more, then what it means.
|
||||
let data = core.model_errors(m);
|
||||
push(out, check('data', 'People and devices consistent', length(data) ? 'error' : 'ok',
|
||||
length(data) ? `${join(' ', slice(data, 0, 4))}${length(data) > 4 ? ` (${length(data) - 4} more)` : ''} Such devices are left out of the tunnels: fix or remove them.`
|
||||
: 'Every device has a key and an address of its own inside its server.'));
|
||||
push(out, check('data', _('People and devices consistent'), length(data) ? 'error' : 'ok',
|
||||
length(data) ? join(' ', filter([ join(' ', slice(data, 0, 4)), length(data) > 4 ? sprintf(_('(%d more)'), length(data) - 4) : null,
|
||||
_('Such devices are left out of the tunnels: fix or remove them.') ], (x) => x))
|
||||
: _('Every device has a key and an address of its own inside its server.'),
|
||||
null, _('People and devices are inconsistent')));
|
||||
|
||||
let fwc = cursor();
|
||||
fwc.load('firewall');
|
||||
@@ -516,21 +519,23 @@ export function health(m) {
|
||||
for (let id, srv in m.servers) {
|
||||
let label = length(m.servers) > 1 ? ` (${srv.name})` : '';
|
||||
if (!srv.enabled) {
|
||||
push(out, check(`srv_${id}`, `Server${label}`, 'skip', 'Server is disabled.'));
|
||||
push(out, check(`srv_${id}`, _('Server') + label, 'skip', _('Server is disabled.')));
|
||||
continue;
|
||||
}
|
||||
push(out, ...awg_checks(m, id, srv, label, fwc, dmp, rep));
|
||||
push(out, endpoint_check(`ep_${id}`, `Public address${label}`, srv, core.endpoint_host(m, srv), `UDP ${srv.port}`));
|
||||
push(out, endpoint_check(`ep_${id}`, _('Public address') + label, _('Public address needs attention') + label,
|
||||
srv, core.endpoint_host(m, srv), `UDP ${srv.port}`));
|
||||
|
||||
if (srv.lan_like) {
|
||||
let ls = loop.status();
|
||||
let nh = need.home;
|
||||
push(out, check(`home_${id}`, `Internet like a home device${label}`, ls.active && ls.bridged ? 'ok' : 'warn',
|
||||
ls.active && ls.bridged ? `Traffic enters ${ls.dev} as ${ls.address}, so it is handled like any device on your LAN.` :
|
||||
length(nh) ? `Needs ${join(' and ', nh)}. Internet traffic leaves through WAN directly until then.` :
|
||||
ls.active ? `The link is up but not attached to ${ls.dev}.` :
|
||||
`${ls.error ?? 'Not set up.'} Internet traffic leaves through WAN directly.`,
|
||||
ls.active && ls.bridged ? null : length(nh) ? 'install:home' : 'apply'));
|
||||
push(out, check(`home_${id}`, _('Internet like a home device') + label, ls.active && ls.bridged ? 'ok' : 'warn',
|
||||
ls.active && ls.bridged ? sprintf(_('Traffic enters %s as %s, so it is handled like any device on your LAN.'), ls.dev, ls.address) :
|
||||
length(nh) ? sprintf(_('Needs %s. Internet traffic leaves through WAN directly until then.'), join(', ', nh)) :
|
||||
ls.active ? sprintf(_('The link is up but not attached to %s.'), ls.dev) :
|
||||
// loop.status()'s own sentence, then what it means.
|
||||
`${ls.error ?? _('Not set up.')} ${_('Internet traffic leaves through WAN directly.')}`,
|
||||
ls.active && ls.bridged ? null : length(nh) ? 'install:home' : 'apply', _('Internet like a home device isn’t working') + label));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -542,10 +547,11 @@ export function health(m) {
|
||||
// A new config (a server turned on, the home link up) restarts it: give it a few seconds.
|
||||
let restarting = !running && conf != null && time() - conf.mtime < 10;
|
||||
let ok = running || restarting;
|
||||
push(out, check('resolver', 'DNS for Home-only devices', ok ? 'ok' : 'warn',
|
||||
restarting ? 'Restarting with the new settings.' :
|
||||
ok ? (rt.mode == 'ns' ? `Plain resolver running next to the LAN (${rt.address}).` : `Plain resolver on port ${rt.port}.`)
|
||||
: 'The resolver is not running; Home-only devices cannot resolve names.', ok ? null : 'apply'));
|
||||
push(out, check('resolver', _('DNS for Home-only devices'), ok ? 'ok' : 'warn',
|
||||
restarting ? _('Restarting with the new settings.') :
|
||||
ok ? (rt.mode == 'ns' ? sprintf(_('Plain resolver running next to the LAN (%s).'), rt.address) : sprintf(_('Plain resolver on port %d.'), rt.port))
|
||||
: _('The resolver is not running; Home-only devices cannot resolve names.'),
|
||||
ok ? null : 'apply', _('DNS for Home-only devices isn’t working')));
|
||||
}
|
||||
|
||||
if (m.settings.portal_enabled)
|
||||
@@ -572,9 +578,9 @@ export function fix(id) {
|
||||
// Only Dawnline's own tunnels: never another interface of the router.
|
||||
let mine = filter(values(core.load().servers), (s) => s.ifname == m[1] && s.private_key);
|
||||
if (!length(mine))
|
||||
die(`${m[1]} is not one of Dawnline's tunnels.`);
|
||||
die(sprintf(_("%s is not one of Dawnline's tunnels."), m[1]));
|
||||
system(`ifup ${q(m[1])}`);
|
||||
return { ok: true };
|
||||
}
|
||||
die('Unknown fix.');
|
||||
die(_('Unknown fix.'));
|
||||
};
|
||||
@@ -0,0 +1,71 @@
|
||||
// Dawnline — the backend's messages in the admin's language: what die()
|
||||
// reports, the health checks, the updater's phases. Text is English in the
|
||||
// code, wrapped in _() and N_() (web/i18n/extract.ts collects them into the
|
||||
// luci-i18n-dawnline-<lang> catalog with the admin UI's strings), with
|
||||
// placeholders filled by sprintf() after the lookup:
|
||||
//
|
||||
// die(sprintf(_('Download failed: %s'), asset));
|
||||
//
|
||||
// Translated through LuCI's own catalog reader (luci.core, as LuCI's pages
|
||||
// are) in the language use() set: the admin page's, sent with every RPC call
|
||||
// (rpcd/ucode/luci.dawnline) and handed to the updater. With no language,
|
||||
// no Dawnline translation installed for it, or no luci-base (the unit tests'
|
||||
// rootfs), the English as written. The portal sets none: its page translates
|
||||
// the messages it gets with its own catalog.
|
||||
|
||||
import { stat } from 'fs';
|
||||
|
||||
const DIR = '/usr/lib/lua/luci/i18n';
|
||||
|
||||
// A C module, loaded at run time: luci-base may be missing, and a static import would not compile then.
|
||||
let lmo = null;
|
||||
try {
|
||||
lmo = require('luci.core');
|
||||
}
|
||||
catch (e) {
|
||||
lmo = null;
|
||||
}
|
||||
|
||||
let active = null;
|
||||
|
||||
/**
|
||||
* Speak `lang` from now on ("ru"; null or "en" for English). Only a language
|
||||
* with a Dawnline catalog: LuCI's others alone would translate a few words.
|
||||
*/
|
||||
export function use(lang) {
|
||||
active = null;
|
||||
if (!lmo || type(lang) != 'string' || lang == 'en' || !match(lang, /^[a-z][a-z][a-z]?([_-][A-Za-z][A-Za-z][A-Za-z]?[A-Za-z]?)?$/))
|
||||
return;
|
||||
lang = lc(replace(lang, '_', '-'));
|
||||
if (!stat(`${DIR}/dawnline.${lang}.lmo`))
|
||||
return;
|
||||
if (lmo.load_catalog(lang, DIR) && lmo.change_catalog(lang))
|
||||
active = lang;
|
||||
};
|
||||
|
||||
/** The language use() set, when its catalog is in use; null for English. */
|
||||
export function current() {
|
||||
return active;
|
||||
};
|
||||
|
||||
/** `msg` in the language use() set (the English when the catalog has no translation). */
|
||||
export function _(msg) {
|
||||
return (active ? lmo.translate(msg) : null) ?? msg;
|
||||
};
|
||||
|
||||
/** `one` or `many` for n, by the language's plural rules (Russian has three forms). */
|
||||
export function N_(n, one, many) {
|
||||
return (active ? lmo.ntranslate(n, one, many) : null) ?? (n == 1 ? one : many);
|
||||
};
|
||||
|
||||
/**
|
||||
* A service log line's words, as written: the log is kept in English (the
|
||||
* agent that writes most of it has no language) and read later in any.
|
||||
* Marking them collects them into the catalog and into the admin page's list
|
||||
* of log templates, which puts each line into the reader's language when it
|
||||
* is shown (web/src/admin/events/logwords.ts): sprintf(L_('updated · %s → %s'), a, b).
|
||||
* Keep a line's English as it was: old lines match it too.
|
||||
*/
|
||||
export function L_(s) {
|
||||
return s;
|
||||
};
|
||||
@@ -22,7 +22,8 @@
|
||||
//
|
||||
// Everything is derived from the router at run time; nothing assumes a
|
||||
// particular subnet or tool. If the LAN is not a bridge or setup fails, the
|
||||
// direct path stays and status() says why.
|
||||
// direct path stays and status() says why (kept as a code in loop.json, which
|
||||
// apply and the agent write with no language; error_text() makes the words).
|
||||
|
||||
import { readfile, writefile, readlink, stat, unlink } from 'fs';
|
||||
import { cursor } from 'uci';
|
||||
@@ -33,6 +34,7 @@ import * as net from 'dawnline.net';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as store from 'dawnline.store';
|
||||
import * as resolver from 'dawnline.resolver';
|
||||
import { _, L_ } from 'dawnline.i18n';
|
||||
|
||||
export const NS = 'dawnline';
|
||||
const TX_ROOT = net.INTERNAL.transit, TX_NS = 'dlx1', LAN_ROOT = net.INTERNAL.lan, LAN_NS = 'dll1';
|
||||
@@ -40,7 +42,7 @@ const PREF_LOOP_DNS = 5205, PREF_MAIN = 5210, PREF_LOOP = 5290;
|
||||
export const RESOLVER_CONF = resolver.CONF;
|
||||
const STATE = `${RUN_DIR}/loop.json`;
|
||||
|
||||
const WHO = 'Internet like a home device';
|
||||
const WHO = L_('Internet like a home device');
|
||||
|
||||
function log(msg, level, detail) {
|
||||
slog('dawnline', level ?? 'info', msg, detail, WHO);
|
||||
@@ -180,6 +182,57 @@ function pick_table(saved) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/* ---------- why it is off ---------- */
|
||||
|
||||
/*
|
||||
* The reasons plan() and ensure() give, kept in loop.json:
|
||||
* { code: 'no_lan' } no LAN detected
|
||||
* { code: 'not_bridge', dev } the LAN is not a bridge
|
||||
* { code: 'no_ipv4', dev } the LAN has no IPv4 address
|
||||
* { code: 'no_address', net } no free address on the LAN's network
|
||||
* { code: 'no_transit' } no free link-local range for the internal link
|
||||
* { code: 'no_table' } no free routing table
|
||||
* { code: 'setup', detail } a command failed (detail: it and what it said)
|
||||
*/
|
||||
|
||||
/** A reason from plan() for the service log: English, like every log line. */
|
||||
function error_note(e) {
|
||||
if (e.code == 'no_lan')
|
||||
return L_('No LAN detected.');
|
||||
if (e.code == 'not_bridge')
|
||||
return sprintf(L_('%s is not a bridge, so Dawnline cannot join the LAN as a device.'), e.dev);
|
||||
if (e.code == 'no_ipv4')
|
||||
return sprintf(L_('%s has no IPv4 address.'), e.dev);
|
||||
if (e.code == 'no_address')
|
||||
return sprintf(L_('No free address on %s.'), e.net);
|
||||
if (e.code == 'no_transit')
|
||||
return L_('No free link-local range for the internal link.');
|
||||
return L_('No free routing table.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Why "like a home device" is off (a reason above), as a sentence in the
|
||||
* reader's language. Null for none; the English of a loop.json written by an
|
||||
* older version as it is.
|
||||
*/
|
||||
export function error_text(e) {
|
||||
if (type(e) != 'object')
|
||||
return e ?? null;
|
||||
if (e.code == 'no_lan')
|
||||
return _('No LAN detected.');
|
||||
if (e.code == 'not_bridge')
|
||||
return sprintf(_('%s is not a bridge, so Dawnline cannot join the LAN as a device.'), e.dev);
|
||||
if (e.code == 'no_ipv4')
|
||||
return sprintf(_('%s has no IPv4 address.'), e.dev);
|
||||
if (e.code == 'no_address')
|
||||
return sprintf(_('No free address on %s.'), e.net);
|
||||
if (e.code == 'no_transit')
|
||||
return _('No free link-local range for the internal link.');
|
||||
if (e.code == 'no_table')
|
||||
return _('No free routing table.');
|
||||
return sprintf(_('Setup failed: %s'), e.detail);
|
||||
};
|
||||
|
||||
/* ---------- plan ---------- */
|
||||
|
||||
function settings() {
|
||||
@@ -199,8 +252,8 @@ function all_ifnames(m) {
|
||||
}
|
||||
|
||||
/**
|
||||
* What should exist, or { error } when it cannot. Pure apart from reading
|
||||
* router state (and one ping per candidate address).
|
||||
* What should exist, or { error } (a reason, see error_text) when it cannot.
|
||||
* Pure apart from reading router state (and one ping per candidate address).
|
||||
*/
|
||||
export function plan(m) {
|
||||
let srvs = wanted(m);
|
||||
@@ -210,24 +263,24 @@ export function plan(m) {
|
||||
let dev = snap.lan;
|
||||
let d = snap.devices[dev];
|
||||
if (!dev || !d)
|
||||
return { error: 'No LAN detected.' };
|
||||
return { error: { code: 'no_lan' } };
|
||||
if (d.kind != 'bridge')
|
||||
return { error: `${dev} is not a bridge, so Dawnline cannot join the LAN as a device.` };
|
||||
return { error: { code: 'not_bridge', dev } };
|
||||
let lan = parse_cidr(d.addrs[0]);
|
||||
if (!lan)
|
||||
return { error: `${dev} has no IPv4 address.` };
|
||||
return { error: { code: 'no_ipv4', dev } };
|
||||
let facts = dhcp_facts(d.logical, lan);
|
||||
let st = settings();
|
||||
let addr = pick_address(lan, facts, st.lan_address, dev);
|
||||
if (!addr)
|
||||
return { error: `No free address on ${int2ip(lan.net)}/${lan.prefix}.` };
|
||||
return { error: { code: 'no_address', net: `${int2ip(lan.net)}/${lan.prefix}` } };
|
||||
let last = read_json(STATE, {});
|
||||
let tx = pick_transit(last?.transit);
|
||||
if (tx == null)
|
||||
return { error: 'No free link-local range for the internal link.' };
|
||||
return { error: { code: 'no_transit' } };
|
||||
let table = pick_table(last?.plan?.table);
|
||||
if (table == null)
|
||||
return { error: 'No free routing table.' };
|
||||
return { error: { code: 'no_table' } };
|
||||
let servers = [];
|
||||
for (let srv in srvs) {
|
||||
let sn = net.server_net(srv, snap);
|
||||
@@ -362,8 +415,8 @@ export function ensure(m, force) {
|
||||
remove(ifnames);
|
||||
ensure_dir(RUN_DIR);
|
||||
write_json(STATE, { error: p.error, off: !!p.off }, 0o644);
|
||||
if (p.error && p.error != was.error)
|
||||
log('is off', 'error', p.error);
|
||||
if (p.error && sprintf('%J', p.error) != sprintf('%J', was.error))
|
||||
log(L_('is off'), 'error', error_note(p.error));
|
||||
return p;
|
||||
}
|
||||
let last = read_json(STATE, {});
|
||||
@@ -411,18 +464,19 @@ export function ensure(m, force) {
|
||||
push(errs, ...run(sync_rules(p, ifnames)));
|
||||
|
||||
if (length(errs)) {
|
||||
if (read_json(STATE, {}).error != `Setup failed: ${errs[0]}`)
|
||||
log('failed — internet goes out directly for now', 'error', errs[0]);
|
||||
let why = { code: 'setup', detail: errs[0] };
|
||||
if (sprintf('%J', read_json(STATE, {}).error) != sprintf('%J', why))
|
||||
log(L_('failed - internet goes out directly for now'), 'error', errs[0]);
|
||||
remove(ifnames);
|
||||
write_json(STATE, { error: `Setup failed: ${errs[0]}` }, 0o644);
|
||||
return { error: errs[0] };
|
||||
write_json(STATE, { error: why }, 0o644);
|
||||
return { error: why };
|
||||
}
|
||||
ensure_dir(RUN_DIR);
|
||||
write_json(STATE, { applied: time(), plan: p, transit: p.transit }, 0o644);
|
||||
if (!last.applied || last.plan?.dev != p.dev || last.plan?.address != p.address)
|
||||
log(`is on · traffic enters ${p.dev} as ${p.address}`, 'up');
|
||||
log(sprintf(L_('is on · traffic enters %s as %s'), p.dev, p.address), 'up');
|
||||
else if (!healthy)
|
||||
log(`was broken — set up again (${p.dev} as ${p.address})`, 'repair');
|
||||
log(sprintf(L_('was broken - set up again (%s as %s)'), p.dev, p.address), 'repair');
|
||||
return p;
|
||||
};
|
||||
|
||||
@@ -440,7 +494,7 @@ export function remember(p) {
|
||||
});
|
||||
};
|
||||
|
||||
/** Last applied state for views and health checks. */
|
||||
/** Last applied state for views and health checks; `error` says why it is off (error_text). */
|
||||
export function status() {
|
||||
let s = read_json(STATE, {});
|
||||
if (s.plan)
|
||||
@@ -449,7 +503,7 @@ export function status() {
|
||||
dev: s.plan.dev, address: s.plan.address, dns: s.plan.dns, gateway: s.plan.gateway, transit: s.plan.tx_ns,
|
||||
bridged: replace(readlink(`/sys/class/net/${LAN_ROOT}/master`) ?? '', /^.*\//, '') == s.plan.dev,
|
||||
};
|
||||
return { active: false, off: !!s.off, error: s.error };
|
||||
return { active: false, off: !!s.off, error: error_text(s.error) };
|
||||
};
|
||||
|
||||
/** The DNS address tunnel clients should use while the loop is up. */
|
||||
|
||||
@@ -8,6 +8,7 @@ import { stat, unlink } from 'fs';
|
||||
import { q, slog } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as store from 'dawnline.store';
|
||||
import { L_ } from 'dawnline.i18n';
|
||||
|
||||
const LAN_CGI = '/www/cgi-bin/dawnline-portal';
|
||||
const LAN_CGI_URL = '/cgi-bin/dawnline-portal';
|
||||
@@ -32,7 +33,7 @@ function word_codes() {
|
||||
}
|
||||
});
|
||||
});
|
||||
slog('dawnline', 'info', 'moved to word codes', null, 'Personal links');
|
||||
slog('dawnline', 'info', L_('moved to word codes'), null, L_('Personal links'));
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -101,7 +102,7 @@ function auto_mtu() {
|
||||
mark_migrated(w, 'auto_mtu');
|
||||
});
|
||||
if (any)
|
||||
slog('dawnline', 'info', 'MTU is now automatic', null, 'Servers');
|
||||
slog('dawnline', 'info', L_('MTU is now automatic'), null, L_('Servers'));
|
||||
}
|
||||
|
||||
/** All of them, in order. */
|
||||
|
||||
@@ -2,13 +2,15 @@
|
||||
// ifname and marked `_dawnline` = server id. Only interfaces Dawnline created
|
||||
// are changed or removed: a name already used by another interface (`lan`, a
|
||||
// tunnel of your own, one from an imported config) is left alone and the
|
||||
// server is reported instead.
|
||||
// server is reported instead. Why a server is kept down is kept in
|
||||
// core.BLOCKED as a code with its values (awg.blocked_text says it).
|
||||
|
||||
import { cursor } from 'uci';
|
||||
import { stat, unlink, writefile } from 'fs';
|
||||
import { q, uci_put, uci_section, ack_config, iface_intent, ensure_dir, read_json, write_json, slog, RUN_DIR } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as awg from 'dawnline.awg';
|
||||
import { L_ } from 'dawnline.i18n';
|
||||
|
||||
// Set while AmneziaWG is missing and that was logged (once until it is back).
|
||||
const NO_AWG = `${RUN_DIR}/netifd-no-awg`;
|
||||
@@ -35,12 +37,12 @@ export function sync(m) {
|
||||
let changed = false, touched = [], want = {};
|
||||
// Servers whose interface can't be set up (core.BLOCKED), each logged once while it lasts.
|
||||
let was = read_json(core.BLOCKED, {}), blocked = {};
|
||||
let block = (srv, msg, detail) => {
|
||||
blocked[srv.id] = msg;
|
||||
let block = (srv, why, detail) => {
|
||||
blocked[srv.id] = why;
|
||||
// The rest of this apply works from the same model: no tunnel for it there either.
|
||||
srv.blocked = msg;
|
||||
if (was[srv.id] != msg)
|
||||
log(srv.name, msg, 'error', detail);
|
||||
srv.blocked = why;
|
||||
if (sprintf('%J', was[srv.id]) != sprintf('%J', why))
|
||||
log(srv.name, awg.blocked_note(why), 'error', detail);
|
||||
};
|
||||
|
||||
// Without amneziawg-tools there is no protocol script: changing or bringing
|
||||
@@ -49,7 +51,7 @@ export function sync(m) {
|
||||
if (tools && stat(NO_AWG))
|
||||
unlink(NO_AWG);
|
||||
else if (!tools && length(filter(values(m.servers), (s) => s.private_key)) && !stat(NO_AWG)) {
|
||||
log('AmneziaWG', "isn't installed: tunnels were left as they are", 'error', 'Install it in Dawnline → Components.');
|
||||
log('AmneziaWG', L_("isn't installed: tunnels were left as they are"), 'error', L_('Install it in Dawnline → Components.'));
|
||||
ensure_dir(RUN_DIR);
|
||||
writefile(NO_AWG, `${time()}`);
|
||||
}
|
||||
@@ -59,12 +61,12 @@ export function sync(m) {
|
||||
continue;
|
||||
let ifn = srv.ifname;
|
||||
if (!core.valid_ifname(ifn)) {
|
||||
block(srv, `has an invalid interface name "${ifn}"`, 'Interface name: 1-12 lowercase letters, digits or _.');
|
||||
block(srv, { code: 'ifname', ifname: ifn }, 'Interface name: 1-12 lowercase letters, digits or _.');
|
||||
continue;
|
||||
}
|
||||
let own = owner(ifn, c);
|
||||
if (own != null && own != id) {
|
||||
block(srv, `can't use the network interface ${ifn}: it exists and isn't Dawnline's`,
|
||||
block(srv, { code: 'taken', ifname: ifn },
|
||||
'Dawnline never changes interfaces it did not create. Choose another interface name for this server.');
|
||||
continue;
|
||||
}
|
||||
@@ -74,7 +76,7 @@ export function sync(m) {
|
||||
// disguise is changed.
|
||||
let why = tools ? awg.obf_unsupported(srv.obf) : null;
|
||||
if (why) {
|
||||
block(srv, `is kept down: ${why}`, 'Install that AmneziaWG build in Dawnline → Components, or switch the disguise on the Server page.');
|
||||
block(srv, why, 'Install that AmneziaWG build in Dawnline → Components, or switch the disguise on the Server page.');
|
||||
continue;
|
||||
}
|
||||
delete srv.blocked;
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
import { access, popen, stat } from 'fs';
|
||||
import { q } from 'dawnline.util';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
function run(cmd) {
|
||||
let p = popen(cmd + ' 2>&1', 'r');
|
||||
@@ -99,8 +100,9 @@ function preflight(files, need_kb, log) {
|
||||
for (let f in files ?? [])
|
||||
need += int(((stat(f)?.size ?? 0) * 3) / 1024);
|
||||
if (free < need)
|
||||
die(`Not enough free space on the router: ${int(free / 1024)} MB free, about ${int(need / 1024) + 1} MB needed. Remove old backups or packages first`);
|
||||
log?.(` ${int(free / 1024)} MB free on the overlay`);
|
||||
die(sprintf(_('Not enough free space on the router: %d MB free, about %d MB needed. Remove old backups or packages first'),
|
||||
int(free / 1024), int(need / 1024) + 1));
|
||||
log?.(' ' + sprintf(_('%d MB free on the overlay'), int(free / 1024)));
|
||||
}
|
||||
|
||||
/** Package files (from a release): force also reinstalls the same version or goes back to an older one. */
|
||||
@@ -115,8 +117,8 @@ export function install_files(files, force, log) {
|
||||
let before = force ? stat(marker)?.mtime : null;
|
||||
let ok = logged(`apk add --allow-untrusted ${args}`, log).code == 0;
|
||||
if (ok && force && before != null && stat(marker)?.mtime == before) {
|
||||
log?.(' apk did not reinstall the version that is already installed');
|
||||
die("apk doesn't reinstall an installed version. Install a different release, or run install.sh on the router");
|
||||
log?.(' ' + _('apk did not reinstall the version that is already installed'));
|
||||
die(_("apk doesn't reinstall an installed version. Install a different release, or run install.sh on the router"));
|
||||
}
|
||||
return ok;
|
||||
};
|
||||
|
||||
@@ -24,6 +24,10 @@
|
||||
// disguise) only go over HTTPS: a plain-HTTP link (an IP address in Settings)
|
||||
// shows the page, but gets them from its HTTPS twin.
|
||||
//
|
||||
// Messages go out in the page's language (Accept-Language: the portal's
|
||||
// fetch sends the visitor's choice) when a Dawnline translation for it is
|
||||
// installed; else in English, and the page translates the ones it knows.
|
||||
//
|
||||
// handle() serves one request: `io` = { env, headers, read(n), write(s) }; the
|
||||
// CGI script (cgi.uc) is its wrapper, behind the shell door www/cgi-bin/portal
|
||||
// that answers anything not shaped like a link (its not_found() twin).
|
||||
@@ -36,6 +40,8 @@ import * as live from 'dawnline.live';
|
||||
import * as view from 'dawnline.view';
|
||||
import * as schema from 'dawnline.schema';
|
||||
import * as devices from 'dawnline.devices';
|
||||
import * as i18n from 'dawnline.i18n';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
const RATE = `${RUN_DIR}/portal-rate.json`;
|
||||
const ASSETS = '/usr/share/dawnline/portal/assets';
|
||||
@@ -60,13 +66,22 @@ const SECURITY_HEADERS = {
|
||||
'Cache-Control': 'no-store',
|
||||
};
|
||||
|
||||
const NOT_READY = "Adding devices isn't available right now: the VPN server isn't ready. Ask whoever sent you this link.";
|
||||
|
||||
// States the admin stopped the person in: the portal only shows, it changes nothing.
|
||||
const LOCKED = {
|
||||
paused: 'Your access is paused.',
|
||||
expired: 'Your access has ended.',
|
||||
};
|
||||
const LOCKED = [ 'paused', 'expired' ];
|
||||
|
||||
/** Why a stopped person (a LOCKED state) can't change anything, in the visitor's language; null for other states. */
|
||||
function locked_reason(st) {
|
||||
if (st == 'paused')
|
||||
return _('Your access is paused.');
|
||||
if (st == 'expired')
|
||||
return _('Your access has ended.');
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Why a new device or a new set-up is refused while the router has no AmneziaWG. */
|
||||
function not_ready() {
|
||||
return _("Adding devices isn't available right now: the VPN server isn't ready. Ask whoever sent you this link.");
|
||||
}
|
||||
|
||||
function html_escape(s) {
|
||||
return replace(`${s}`, /[&<>"']/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' })[c]);
|
||||
@@ -124,7 +139,7 @@ function body(r) {
|
||||
if (len <= 0)
|
||||
return {};
|
||||
if (len > BODY_MAX)
|
||||
fail(r, '413 Payload Too Large', 'Request too large.');
|
||||
fail(r, '413 Payload Too Large', _('Request too large.'));
|
||||
let raw = '';
|
||||
while (length(raw) < len) {
|
||||
let chunk = r.io.read(len - length(raw));
|
||||
@@ -137,7 +152,7 @@ function body(r) {
|
||||
return type(j) == 'object' ? j : {};
|
||||
}
|
||||
catch (e) {
|
||||
fail(r, '400 Bad Request', 'Invalid JSON.');
|
||||
fail(r, '400 Bad Request', _('Invalid JSON.'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -236,7 +251,7 @@ function rate_action(r) {
|
||||
write_json(RATE, st, 0o600);
|
||||
unlock(l);
|
||||
if (v.count > ACTION_LIMIT)
|
||||
fail(r, '429 Too Many Requests', 'Too many changes in a short time. Try again in a few minutes.');
|
||||
fail(r, '429 Too Many Requests', _('Too many changes in a short time. Try again in a few minutes.'));
|
||||
}
|
||||
|
||||
/* ---------- pages ---------- */
|
||||
@@ -305,7 +320,7 @@ function person_state(m, p, usage) {
|
||||
let st = core.person_state(m, p, usage);
|
||||
if (st == 'server_off') {
|
||||
let own = core.own_state(m, p, usage);
|
||||
if (LOCKED[own])
|
||||
if (index(LOCKED, own) >= 0)
|
||||
return own;
|
||||
}
|
||||
return st;
|
||||
@@ -313,7 +328,7 @@ function person_state(m, p, usage) {
|
||||
|
||||
/** Why the person can't change anything right now, or null. */
|
||||
function locked(r) {
|
||||
return LOCKED[person_state(r.m, r.person, core.load_usage())] ?? null;
|
||||
return locked_reason(person_state(r.m, r.person, core.load_usage()));
|
||||
}
|
||||
|
||||
/** Refuses a change (or a config) while the person is stopped. */
|
||||
@@ -340,7 +355,7 @@ function https_url(r) {
|
||||
function need_https(r) {
|
||||
let u = https_url(r);
|
||||
if (u)
|
||||
send_json(r, '403 Forbidden', { error: 'Open this link over HTTPS to get the connection settings.', https_url: u });
|
||||
send_json(r, '403 Forbidden', { error: _('Open this link over HTTPS to get the connection settings.'), https_url: u });
|
||||
}
|
||||
|
||||
/** The router's offset from UTC in minutes: the admin sets hours in its time, the page shows the visitor's. */
|
||||
@@ -371,7 +386,7 @@ function state(r) {
|
||||
preset: !srv || awg.obf_neutral(srv.obf) ? 'off' : index([ 'balanced', 'max' ], srv.preset) >= 0 ? srv.preset : 'legacy',
|
||||
},
|
||||
can_add: length(person.devices) < person.device_limit,
|
||||
locked: LOCKED[v.state] != null,
|
||||
locked: index(LOCKED, v.state) >= 0,
|
||||
// Over plain HTTP: where the configurations are (keys only travel encrypted).
|
||||
https_url: https_url(r),
|
||||
kinds: core.KINDS,
|
||||
@@ -389,7 +404,7 @@ function state(r) {
|
||||
function own_device(r, id) {
|
||||
let d = r.m.devices[id];
|
||||
if (!d || d.person != r.person.id)
|
||||
fail(r, '404 Not Found', 'Device not found.');
|
||||
fail(r, '404 Not Found', _('Device not found.'));
|
||||
return d;
|
||||
}
|
||||
|
||||
@@ -402,7 +417,7 @@ function api_add(r) {
|
||||
need_https(r);
|
||||
let b = body(r);
|
||||
if (!devices.ready())
|
||||
fail(r, '503 Service Unavailable', NOT_READY);
|
||||
fail(r, '503 Service Unavailable', not_ready());
|
||||
rate_action(r);
|
||||
let res = guard(r, () => devices.add(r.person.id, b.name, b.kind, { by: 'portal', public_key: b.public_key }));
|
||||
reload(r);
|
||||
@@ -427,7 +442,7 @@ const ACTIONS = {
|
||||
reconnect: (r, d, b) => {
|
||||
need_https(r);
|
||||
if (!devices.ready())
|
||||
fail(r, '503 Service Unavailable', NOT_READY);
|
||||
fail(r, '503 Service Unavailable', not_ready());
|
||||
let config = guard(r, () => devices.reconnect(d.id, { by: 'portal', person: r.person.id, defer: d.address == r.peer }));
|
||||
return { config };
|
||||
},
|
||||
@@ -443,7 +458,7 @@ function api_device(r, id) {
|
||||
let b = body(r);
|
||||
let act = ACTIONS[b.action];
|
||||
if (!act)
|
||||
fail(r, '400 Bad Request', 'Unknown action.');
|
||||
fail(r, '400 Bad Request', _('Unknown action.'));
|
||||
rate_action(r);
|
||||
let res = act(r, d, b);
|
||||
reload(r);
|
||||
@@ -542,21 +557,23 @@ export function handle(io) {
|
||||
let origin = header('origin');
|
||||
if (!match(env.CONTENT_TYPE ?? '', /^application\/json/) ||
|
||||
(origin != null && origin != `${https ? 'https' : 'http'}://${host}`))
|
||||
fail(r, '403 Forbidden', 'Cross-site request refused.');
|
||||
fail(r, '403 Forbidden', _('Cross-site request refused.'));
|
||||
}
|
||||
else if (r.method != 'GET')
|
||||
fail(r, '405 Method Not Allowed', 'Method not allowed.');
|
||||
fail(r, '405 Method Not Allowed', _('Method not allowed.'));
|
||||
|
||||
let rt = route(API, r.method, slice(rest, 1));
|
||||
if (!rt)
|
||||
fail(r, '404 Not Found', 'Not found.');
|
||||
fail(r, '404 Not Found', _('Not found.'));
|
||||
rt.run(r, rt.args[0]);
|
||||
fail(r, '404 Not Found', 'Not found.');
|
||||
fail(r, '404 Not Found', _('Not found.'));
|
||||
};
|
||||
|
||||
/** Run handle() and swallow its early end. */
|
||||
export function serve(io) {
|
||||
try {
|
||||
// "ru-RU,ru;q=0.9" → ru (i18n.use takes plain language codes only).
|
||||
i18n.use((match(io.env.HTTP_ACCEPT_LANGUAGE ?? '', /^[ \t]*([A-Za-z][A-Za-z][A-Za-z]?)/) ?? [])[1]);
|
||||
handle(io);
|
||||
}
|
||||
catch (e) {
|
||||
|
||||
@@ -6,6 +6,7 @@ import * as awg from 'dawnline.awg';
|
||||
import * as health from 'dawnline.health';
|
||||
import * as schema from 'dawnline.schema';
|
||||
import { uniq } from 'dawnline.util';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/**
|
||||
* An rpcd handler from fn(args): an object result is passed on, anything else
|
||||
@@ -45,16 +46,16 @@ export function default_method() {
|
||||
/** A disguise method the installed AmneziaWG can run. */
|
||||
export function check_method(name) {
|
||||
if (index(METHODS, name) < 0)
|
||||
die('Unknown disguise method.');
|
||||
die(_('Unknown disguise method.'));
|
||||
let c = awg.caps();
|
||||
if (name == 'max' && !c.v3)
|
||||
die(awg.installed()
|
||||
? 'Maximum needs AmneziaWG 3.1 on the router (kmod-amneziawg, amneziawg-tools 3.1): install a 3.1 build in Dawnline → Components.'
|
||||
: 'AmneziaWG is not installed: install it in Dawnline → Components, then choose Maximum.');
|
||||
? _('Maximum needs AmneziaWG 3.1 on the router (kmod-amneziawg, amneziawg-tools 3.1): install a 3.1 build in Dawnline → Components.')
|
||||
: _('AmneziaWG is not installed: install it in Dawnline → Components, then choose Maximum.'));
|
||||
if (name == 'balanced' && !c.v2)
|
||||
die(awg.installed()
|
||||
? 'Balanced needs AmneziaWG 2.0 or newer on the router: install a current build in Dawnline → Components.'
|
||||
: 'AmneziaWG is not installed: install it in Dawnline → Components, then choose Balanced.');
|
||||
? _('Balanced needs AmneziaWG 2.0 or newer on the router: install a current build in Dawnline → Components.')
|
||||
: _('AmneziaWG is not installed: install it in Dawnline → Components, then choose Balanced.'));
|
||||
return name;
|
||||
};
|
||||
|
||||
@@ -75,6 +76,7 @@ function tcp_forwards(m) {
|
||||
/**
|
||||
* TCP ports the portal can't take, and who holds them: [{ from, to, who }].
|
||||
* The router's own (22, 53, 80, 443), other programs and port forwards from WAN.
|
||||
* `who` is shown in the admin's language ("Used by %s.").
|
||||
*/
|
||||
export function tcp_taken(m) {
|
||||
let out = [];
|
||||
@@ -86,11 +88,11 @@ export function tcp_taken(m) {
|
||||
}
|
||||
};
|
||||
for (let p in schema.RESERVED_PORTS)
|
||||
hold(p, 'the router itself');
|
||||
hold(p, _('the router itself'));
|
||||
for (let p, name in health.tcp_port_programs())
|
||||
hold(+p, `${name} on this router`);
|
||||
hold(+p, sprintf(_('%s on this router'), name));
|
||||
for (let f in tcp_forwards(m))
|
||||
push(out, { from: f.from, to: f.to, who: `port forward “${f.name}”` });
|
||||
push(out, { from: f.from, to: f.to, who: sprintf(_('port forward “%s”'), f.name) });
|
||||
return out;
|
||||
};
|
||||
|
||||
@@ -100,12 +102,12 @@ export function check_portal(m, was) {
|
||||
return;
|
||||
let port = s.portal_port;
|
||||
if (!schema.valid_port(port) || index(schema.RESERVED_PORTS, port) >= 0)
|
||||
die('Choose a free port between 1 and 65535 (not 22, 53, 80 or 443).');
|
||||
die(_('Choose a free port between 1 and 65535 (not 22, 53, 80 or 443).'));
|
||||
let ports = [ port ];
|
||||
if (core.portal_http(m)) {
|
||||
let hp = core.portal_http_port(m);
|
||||
if (!schema.valid_port(hp) || index(schema.RESERVED_PORTS, hp) >= 0)
|
||||
die(`Links on IP addresses use plain HTTP on the next port (${hp}), which the portal cannot take. Choose another portal port.`);
|
||||
die(sprintf(_('Links on IP addresses use plain HTTP on the next port (%d), which the portal cannot take. Choose another portal port.'), hp));
|
||||
push(ports, hp);
|
||||
}
|
||||
// Only ports the portal does not hold already: our own uhttpd is not an owner anyway.
|
||||
@@ -120,11 +122,13 @@ export function check_portal(m, was) {
|
||||
continue;
|
||||
let owners = health.tcp_port_owners(p);
|
||||
if (length(owners))
|
||||
die(`TCP ${p} is already used by ${join(', ', owners)}.${p != port ? ' Links on IP addresses use plain HTTP on the port after the portal\'s.' : ''} Choose another portal port.`);
|
||||
die(sprintf(p != port
|
||||
? _("TCP %d is already used by %s. Links on IP addresses use plain HTTP on the port after the portal's. Choose another portal port.")
|
||||
: _('TCP %d is already used by %s. Choose another portal port.'), p, join(', ', owners)));
|
||||
}
|
||||
// A forwarded port never reaches the router: the portal would be unreachable.
|
||||
for (let p in ports)
|
||||
for (let f in tcp_forwards(m))
|
||||
if (f.from <= p && p <= f.to)
|
||||
die(`TCP ${p} is sent on by port forward “${f.name}”. Choose another portal port.`);
|
||||
die(sprintf(_('TCP %d is sent on by port forward “%s”. Choose another portal port.'), p, f.name));
|
||||
};
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
import { readfile } from 'fs';
|
||||
import { cursor } from 'uci';
|
||||
import { sh_out, ip2int, rand_int, rand_hex, admin_log, valid_name, ulength, NAME_RULE } from 'dawnline.util';
|
||||
import { sh_out, ip2int, rand_int, rand_hex, admin_log, valid_name, ulength } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as apply from 'dawnline.apply';
|
||||
import * as net from 'dawnline.net';
|
||||
@@ -12,6 +12,7 @@ import * as access from 'dawnline.access';
|
||||
import * as store from 'dawnline.store';
|
||||
import * as schema from 'dawnline.schema';
|
||||
import { wrap, str } from 'dawnline.rpc.common';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/* ---------- services ---------- */
|
||||
|
||||
@@ -22,29 +23,29 @@ function new_id(m, make) {
|
||||
if (!store.id_taken(m, id))
|
||||
return id;
|
||||
}
|
||||
die('Could not find a free id, try again.');
|
||||
die(_('Could not find a free id, try again.'));
|
||||
}
|
||||
|
||||
function service_set(a) {
|
||||
let name = str(a.name);
|
||||
if (!valid_name(name))
|
||||
die(`Service: ${NAME_RULE}`);
|
||||
die(_('Service: Enter a name: up to 48 characters, without < > " or \\.'));
|
||||
let address = str(a.address);
|
||||
if (!schema.ipv4(address))
|
||||
die('Address must be an IPv4 address.');
|
||||
die(_('Address must be an IPv4 address.'));
|
||||
let ports = filter(map(type(a.ports) == 'array' ? a.ports : split(str(a.ports), /[ ,]+/), str), (x) => x != '');
|
||||
for (let pt in ports)
|
||||
if (!schema.valid_port(pt))
|
||||
die(`Invalid port ${pt}.`);
|
||||
die(sprintf(_('Invalid port %s.'), pt));
|
||||
let id = store.transact((c, m) => {
|
||||
let id = str(a.id);
|
||||
if (id == '')
|
||||
id = new_id(m, () => `svc_${rand_int(100000, 999999)}`);
|
||||
else if (!match(id, /^[A-Za-z0-9_]{1,32}$/))
|
||||
die('Invalid service id.');
|
||||
die(_('Invalid service id.'));
|
||||
// Never turn a person, device, server, circle or the settings into a service.
|
||||
else if (!m.services[id] && store.id_taken(m, id))
|
||||
die('That id is taken.');
|
||||
die(_('That id is taken.'));
|
||||
c.set(core.CONFIG, id, 'service');
|
||||
c.set(core.CONFIG, id, 'name', name);
|
||||
c.set(core.CONFIG, id, 'address', address);
|
||||
@@ -61,7 +62,7 @@ function service_set(a) {
|
||||
function service_delete(a) {
|
||||
store.transact((c, m) => {
|
||||
if (!m.services[a.id])
|
||||
die('Unknown service.');
|
||||
die(_('Unknown service.'));
|
||||
c.delete(core.CONFIG, a.id);
|
||||
for (let pid, p in m.people)
|
||||
if (index(p.services, a.id) >= 0) {
|
||||
@@ -82,17 +83,17 @@ function service_delete(a) {
|
||||
function circle_set(a) {
|
||||
let name = str(a.name);
|
||||
if (!valid_name(name) || ulength(name) > 32)
|
||||
die('Enter a circle name: up to 32 characters, without < > " or \\.');
|
||||
die(_('Enter a circle name: up to 32 characters, without < > " or \\.'));
|
||||
let res = store.transact((c, m) => {
|
||||
let ci = a.id ? m.circles[a.id] : null;
|
||||
if (a.id && !ci)
|
||||
die('Unknown circle.');
|
||||
die(_('Unknown circle.'));
|
||||
let server = ci?.server ?? a.server;
|
||||
if (!m.servers[server])
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
for (let id, o in m.circles)
|
||||
if (id != a.id && o.server == server && lc(o.name) == lc(name))
|
||||
die(`${name} already exists.`);
|
||||
die(sprintf(_('%s already exists.'), name));
|
||||
let id = ci?.id ?? new_id(m, () => `c_${rand_hex(4)}`);
|
||||
let n = core.CIRCLE_COLORS;
|
||||
c.set(core.CONFIG, id, 'circle');
|
||||
@@ -121,7 +122,7 @@ function circle_delete(a) {
|
||||
let res = store.transact((c, m) => {
|
||||
let ci = m.circles[a.id];
|
||||
if (!ci)
|
||||
die('Unknown circle.');
|
||||
die(_('Unknown circle.'));
|
||||
c.delete(core.CONFIG, a.id);
|
||||
for (let pid, p in m.people)
|
||||
if (p.circle == a.id)
|
||||
@@ -173,7 +174,7 @@ function home_hosts(a) {
|
||||
let m = core.load();
|
||||
let srv = m.servers[a.id] ?? values(m.servers)[0];
|
||||
if (!srv)
|
||||
die('No server yet.');
|
||||
die(_('No server yet.'));
|
||||
let nets = [];
|
||||
for (let cidr in net.server_net(srv).nets) {
|
||||
let x = match(cidr, /^([0-9.]+)\/([0-9]+)$/);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// Dawnline rpcd methods: Diagnostics (Health, the service log), backups,
|
||||
// export / import, and removing Dawnline.
|
||||
|
||||
import { _ } from 'dawnline.i18n';
|
||||
import { slog_clear, admin_log } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as apply from 'dawnline.apply';
|
||||
@@ -49,10 +50,10 @@ function import_all(a) {
|
||||
/** Remove Dawnline's state from the router (the package is removed by the UI afterwards). */
|
||||
function uninstall(a) {
|
||||
if (a.confirm != 'remove')
|
||||
die('Type "remove" to confirm.');
|
||||
die(_('Type "remove" to confirm.'));
|
||||
// Not in the middle of an update (opkg/apk may be installing Dawnline itself).
|
||||
if (upd.busy())
|
||||
die('An update is running: wait for it to finish, then remove Dawnline.');
|
||||
die(_('An update is running: wait for it to finish, then remove Dawnline.'));
|
||||
backup.backup_create('pre-remove');
|
||||
// Stop first: the agent would put back what teardown removes, and could start an automatic update.
|
||||
system('/etc/init.d/dawnline stop >/dev/null 2>&1; /etc/init.d/dawnline disable >/dev/null 2>&1');
|
||||
|
||||
@@ -9,6 +9,7 @@ import * as awg from 'dawnline.awg';
|
||||
import * as store from 'dawnline.store';
|
||||
import * as devices from 'dawnline.devices';
|
||||
import { wrap, str, clamp_days } from 'dawnline.rpc.common';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
const PERSON_FIELDS = [ 'name', 'access', 'device_limit', 'expires', 'expire_action', 'expire_warn', 'quota_gb', 'quota_period',
|
||||
'bonus_gb', 'hours', 'note', 'dns_mode', 'server' ];
|
||||
@@ -61,7 +62,7 @@ function person_update(a) {
|
||||
function person_pause(a) {
|
||||
store.transact((c, m) => {
|
||||
if (!m.people[a.id])
|
||||
die('Unknown person.');
|
||||
die(_('Unknown person.'));
|
||||
if (a.paused)
|
||||
c.set(core.CONFIG, a.id, 'paused', '1');
|
||||
else
|
||||
@@ -79,7 +80,7 @@ function person_pause(a) {
|
||||
function person_regen(a) {
|
||||
let gone = store.transact((c, m) => {
|
||||
if (!m.people[a.id])
|
||||
die('Unknown person.');
|
||||
die(_('Unknown person.'));
|
||||
c.set(core.CONFIG, a.id, 'code', core.new_code());
|
||||
c.set(core.CONFIG, a.id, 'code_set', `${time()}`);
|
||||
let gone = [];
|
||||
@@ -106,7 +107,7 @@ function person_links(a) {
|
||||
let m = core.load();
|
||||
let p = m.people[a.id];
|
||||
if (!p)
|
||||
die('Unknown person.');
|
||||
die(_('Unknown person.'));
|
||||
return { code: p.code, link: core.portal_url(m, p), links: core.portal_urls(m, p) };
|
||||
}
|
||||
|
||||
@@ -125,7 +126,7 @@ function person_usage(a) {
|
||||
let m = core.load();
|
||||
let p = m.people[a.id];
|
||||
if (!p)
|
||||
die('Unknown person.');
|
||||
die(_('Unknown person.'));
|
||||
let days = clamp_days(a.days);
|
||||
let devs = {};
|
||||
for (let d in p.devices)
|
||||
@@ -144,7 +145,7 @@ function device_config(a) {
|
||||
let m = core.load();
|
||||
let d = m.devices[a.id];
|
||||
if (!d)
|
||||
die('Unknown device.');
|
||||
die(_('Unknown device.'));
|
||||
awg.mark_issued(m, d.id);
|
||||
return awg.client_config(m, d);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Interfaces settings, its disguise, and removing it.
|
||||
|
||||
import { cursor } from 'uci';
|
||||
import { sh_out, sh_bg, parse_cidr, cidr_str, cidr_overlaps, valid_host, valid_name, NAME_RULE, rand_int, uniq, admin_log } from 'dawnline.util';
|
||||
import { sh_out, sh_bg, parse_cidr, cidr_str, cidr_overlaps, valid_host, valid_name, rand_int, uniq, admin_log } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as live from 'dawnline.live';
|
||||
import * as apply from 'dawnline.apply';
|
||||
@@ -15,6 +15,7 @@ import * as health from 'dawnline.health';
|
||||
import * as backup from 'dawnline.backup';
|
||||
import * as devices from 'dawnline.devices';
|
||||
import { wrap, str, check_method, default_method, check_portal, tcp_taken } from 'dawnline.rpc.common';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/** Server ids that would shadow a portal path. */
|
||||
const PORTAL_PATHS = [ 'api', 'assets', 'cgi-bin' ];
|
||||
@@ -27,6 +28,7 @@ const MESH_WORDS = { off: 'devices kept apart', all: 'devices reach each other',
|
||||
* UDP ports a server can't listen on, and who holds them: [{ from, to, who }].
|
||||
* Other servers, tunnel interfaces, programs on the router and port forwards
|
||||
* from its WAN zone. `srv` is the server being edited: its own port isn't counted.
|
||||
* `who` is shown in the admin's language ("Used by %s.").
|
||||
*/
|
||||
function udp_taken(m, srv, wan_zone) {
|
||||
let out = [];
|
||||
@@ -39,26 +41,26 @@ function udp_taken(m, srv, wan_zone) {
|
||||
};
|
||||
for (let id, o in m.servers)
|
||||
if (id != srv?.id)
|
||||
hold(o.port, `server “${o.name}”`);
|
||||
hold(o.port, sprintf(_('server “%s”'), o.name));
|
||||
let nc = cursor();
|
||||
nc.load('network');
|
||||
nc.foreach('network', 'interface', (s) => {
|
||||
if (s.listen_port && s['.name'] != srv?.ifname)
|
||||
hold(+s.listen_port, `interface ${s['.name']}`);
|
||||
hold(+s.listen_port, sprintf(_('interface %s'), s['.name']));
|
||||
});
|
||||
let progs = health.udp_port_programs();
|
||||
for (let p in health.udp_bound())
|
||||
if (p != srv?.port)
|
||||
hold(p, progs[`${p}`] ? `${progs[`${p}`]} on this router` : 'another program on this router');
|
||||
hold(p, progs[`${p}`] ? sprintf(_('%s on this router'), progs[`${p}`]) : _('another program on this router'));
|
||||
for (let f in core.wan_forwards(wan_zone, 'udp'))
|
||||
push(out, { from: f.from, to: f.to, who: `port forward “${f.name}”` });
|
||||
push(out, { from: f.from, to: f.to, who: sprintf(_('port forward “%s”'), f.name) });
|
||||
return out;
|
||||
}
|
||||
|
||||
function check_udp_port(port, taken) {
|
||||
for (let t in taken)
|
||||
if (t.from <= port && port <= t.to)
|
||||
die(`UDP ${port} is used by ${t.who}. Choose another port.`);
|
||||
die(sprintf(_('UDP %d is used by %s. Choose another port.'), port, t.who));
|
||||
}
|
||||
|
||||
/** The usual AmneziaWG port when free, otherwise a random high one. */
|
||||
@@ -197,7 +199,8 @@ function setup_defaults(a) {
|
||||
let port = free_port(udp);
|
||||
return {
|
||||
id: free_server_id(m),
|
||||
name: length(m.servers) ? `Server ${length(m.servers) + 1}` : 'Home',
|
||||
// A name to start from, in the admin's language (it is theirs once saved).
|
||||
name: length(m.servers) ? sprintf(_('Server %d'), length(m.servers) + 1) : _('Home'),
|
||||
ifname: free_ifname(m),
|
||||
port,
|
||||
subnet: free_subnet(map(networks, (n) => n.cidr)),
|
||||
@@ -229,7 +232,7 @@ function setup_defaults(a) {
|
||||
function endpoint_probe(a) {
|
||||
let host = str(a.host);
|
||||
if (host != '' && !valid_host(host))
|
||||
die('Public address must be a hostname or IP address.');
|
||||
die(_('Public address must be a hostname or IP address.'));
|
||||
let m = core.load();
|
||||
let srv = m.servers[str(a.id)] ?? null;
|
||||
let f = health.endpoint_facts(srv, host);
|
||||
@@ -241,14 +244,14 @@ function endpoint_probe(a) {
|
||||
function need_awg_loaded() {
|
||||
devices.need_awg();
|
||||
if (!awg.load().loaded)
|
||||
die("AmneziaWG's kernel module doesn't load on this firmware: reinstall a build for this kernel in Components.");
|
||||
die(_("AmneziaWG's kernel module doesn't load on this firmware: reinstall a build for this kernel in Components."));
|
||||
}
|
||||
|
||||
/** An MTU as typed: '' (automatic) or 1280-1500. */
|
||||
function check_mtu(v) {
|
||||
let s = str(v);
|
||||
if (s != '' && (!match(s, /^[0-9]{1,4}$/) || +s < 1280 || +s > 1500))
|
||||
die('MTU must be 1280-1500.');
|
||||
die(_('MTU must be 1280-1500.'));
|
||||
return s;
|
||||
}
|
||||
|
||||
@@ -260,19 +263,19 @@ function server_create(a) {
|
||||
let id = str(a.id) || 'home';
|
||||
// A UCI section name: a dash would make uci drop it silently.
|
||||
if (!match(id, /^[a-z][a-z0-9_]{0,23}$/))
|
||||
die('Server ID may use lowercase letters, digits and underscores.');
|
||||
die(_('Server ID may use lowercase letters, digits and underscores.'));
|
||||
if (!id_free(m, id))
|
||||
die(`"${id}" is already taken.`);
|
||||
die(sprintf(_('"%s" is already taken.'), id));
|
||||
let nc = cursor();
|
||||
nc.load('network');
|
||||
let ifname = str(a.ifname) || free_ifname(m);
|
||||
if (!ifname_free(m, nc, ifname))
|
||||
die(`Network interface ${ifname} already exists.`);
|
||||
die(sprintf(_('Network interface %s already exists.'), ifname));
|
||||
let udp = udp_taken(m, null, str(a.wan_zone) || 'wan');
|
||||
let port = free_port(udp);
|
||||
if (a.port != null && str(a.port) != '' && str(a.port) != '0') {
|
||||
if (!schema.valid_port(a.port))
|
||||
die('UDP port must be 1-65535.');
|
||||
die(_('UDP port must be 1-65535.'));
|
||||
port = +str(a.port);
|
||||
}
|
||||
check_udp_port(port, udp);
|
||||
@@ -285,7 +288,7 @@ function server_create(a) {
|
||||
// Public addresses inside the tunnel would hide the real hosts behind them.
|
||||
// New servers only: a restored backup keeps what it had.
|
||||
if (pc && !core.private_cidr(pc))
|
||||
die('Use a private range: 10.x.x.x, 172.16–31.x.x or 192.168.x.x.');
|
||||
die(_('Use a private range: 10.x.x.x, 172.16–31.x.x or 192.168.x.x.'));
|
||||
let taken = [ ...router_subnets ];
|
||||
for (let sid, o in m.servers)
|
||||
push(taken, o.subnet);
|
||||
@@ -298,7 +301,7 @@ function server_create(a) {
|
||||
c.set(core.CONFIG, 'settings', 'settings');
|
||||
c.set(core.CONFIG, id, 'server');
|
||||
if (!valid_name(str(a.name) || 'Home'))
|
||||
die(`Server: ${NAME_RULE}`);
|
||||
die(_('Server: Enter a name: up to 48 characters, without < > " or \\.'));
|
||||
set('name', str(a.name) || 'Home');
|
||||
set('ifname', ifname);
|
||||
set('port', `${port}`);
|
||||
@@ -329,7 +332,7 @@ function server_create(a) {
|
||||
c.set(core.CONFIG, 'settings', 'portal_enabled', on ? '1' : '0');
|
||||
if (a.portal_port != null && str(a.portal_port) != '' && str(a.portal_port) != '0') {
|
||||
if (!schema.valid_port(a.portal_port))
|
||||
die('Portal port must be 1-65535.');
|
||||
die(_('Portal port must be 1-65535.'));
|
||||
c.set(core.CONFIG, 'settings', 'portal_port', `${+str(a.portal_port)}`);
|
||||
}
|
||||
}
|
||||
@@ -394,7 +397,7 @@ function interfaces_get(a) {
|
||||
let m = core.load();
|
||||
let srv = m.servers[a.id] ?? values(m.servers)[0];
|
||||
if (!srv)
|
||||
die('No server yet.');
|
||||
die(_('No server yet.'));
|
||||
return interfaces_view(m, srv, net.snapshot(true));
|
||||
}
|
||||
|
||||
@@ -406,12 +409,12 @@ function server_interfaces(a) {
|
||||
let res = store.transact((c, m) => {
|
||||
let srv = m.servers[a.id];
|
||||
if (!srv)
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
if (!auto_wan) {
|
||||
if (!snap.devices[wan_dev])
|
||||
die('Choose the interface that leads to the internet.');
|
||||
die(_('Choose the interface that leads to the internet.'));
|
||||
if (!snap.devices[wan_dev].zone)
|
||||
die(`${wan_dev} is not in a firewall zone, so the server port cannot be opened on it.`);
|
||||
die(sprintf(_('%s is not in a firewall zone, so the server port cannot be opened on it.'), wan_dev));
|
||||
}
|
||||
let lans = [];
|
||||
for (let d in (type(a.lan_devices) == 'array' ? a.lan_devices : [])) {
|
||||
@@ -420,9 +423,9 @@ function server_interfaces(a) {
|
||||
if (d == '' || d == srv.ifname || (!snap.devices[d] && index(srv.lan_devices, d) < 0))
|
||||
continue;
|
||||
if (snap.devices[d]?.master)
|
||||
die(`${d} is part of ${snap.devices[d].master}; choose ${snap.devices[d].master} instead.`);
|
||||
die(sprintf(_('%s is part of %s; choose %s instead.'), d, snap.devices[d].master, snap.devices[d].master));
|
||||
if (d == (auto_wan ? snap.wan : wan_dev))
|
||||
die(`${d} is the WAN.`);
|
||||
die(sprintf(_('%s is the WAN.'), d));
|
||||
push(lans, d);
|
||||
}
|
||||
lans = uniq(lans);
|
||||
@@ -485,7 +488,7 @@ function dns_list(v) {
|
||||
let list = filter(map(type(v) == 'array' ? v : split(str(v), /[ ,]+/), str), (x) => x != '');
|
||||
for (let d in list)
|
||||
if (!schema.ip(d))
|
||||
die(`${d} is not an IP address.`);
|
||||
die(sprintf(_('%s is not an IP address.'), d));
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -497,22 +500,22 @@ function server_update(a) {
|
||||
let srv = store.transact((c, m) => {
|
||||
let srv = m.servers[a.id];
|
||||
if (!srv)
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
let set = (k, val) => (val == null || val == '') ? c.delete(core.CONFIG, srv.id, k) : c.set(core.CONFIG, srv.id, k, val);
|
||||
if (v.name != null) {
|
||||
if (!valid_name(str(v.name)))
|
||||
die(`Server: ${NAME_RULE}`);
|
||||
die(_('Server: Enter a name: up to 48 characters, without < > " or \\.'));
|
||||
set('name', str(v.name));
|
||||
}
|
||||
// Empty = the portal's address (core.endpoint_host), as at creation.
|
||||
if (v.endpoint != null) {
|
||||
if (str(v.endpoint) != '' && !valid_host(str(v.endpoint)))
|
||||
die('Public address must be a hostname or IP address.');
|
||||
die(_('Public address must be a hostname or IP address.'));
|
||||
set('endpoint', str(v.endpoint));
|
||||
}
|
||||
if (v.port != null) {
|
||||
if (!schema.valid_port(v.port))
|
||||
die('UDP port must be 1-65535.');
|
||||
die(_('UDP port must be 1-65535.'));
|
||||
let n = +str(v.port);
|
||||
if (n != srv.port)
|
||||
check_udp_port(n, udp_taken(m, srv, srv.wan_zone));
|
||||
@@ -522,7 +525,7 @@ function server_update(a) {
|
||||
set('enabled', v.enabled === true || v.enabled == '1' ? '1' : '0');
|
||||
if (v.mesh != null) {
|
||||
if (index(core.MESH, v.mesh) < 0)
|
||||
die('Unknown choice for devices reaching each other.');
|
||||
die(_('Unknown choice for devices reaching each other.'));
|
||||
set('mesh', v.mesh);
|
||||
set('device_mesh', null);
|
||||
}
|
||||
@@ -530,7 +533,7 @@ function server_update(a) {
|
||||
set('mtu', check_mtu(v.mtu));
|
||||
if (v.keepalive != null) {
|
||||
if (str(v.keepalive) != '' && (!match(str(v.keepalive), /^[0-9]{1,3}$/) || +v.keepalive > 600))
|
||||
die('Keep-alive must be 0-600 seconds.');
|
||||
die(_('Keep-alive must be 0-600 seconds.'));
|
||||
set('keepalive', str(v.keepalive));
|
||||
}
|
||||
if (v.dns != null) {
|
||||
@@ -544,13 +547,13 @@ function server_update(a) {
|
||||
if (v.subnet != null && str(v.subnet) != '' && str(v.subnet) != srv.subnet) {
|
||||
let pc = parse_cidr(str(v.subnet));
|
||||
if (!pc)
|
||||
die('Subnet must look like 10.77.0.0/24.');
|
||||
die(_('Subnet must look like 10.77.0.0/24.'));
|
||||
if (!core.private_cidr(pc))
|
||||
die('Use a private range: 10.x.x.x, 172.16–31.x.x or 192.168.x.x.');
|
||||
die(_('Use a private range: 10.x.x.x, 172.16–31.x.x or 192.168.x.x.'));
|
||||
let taken = map(filter(taken_networks(m), (n) => n.cidr != srv.subnet && n.name != srv.name), (n) => n.cidr);
|
||||
for (let t in taken)
|
||||
if (cidr_overlaps(pc, parse_cidr(t)))
|
||||
die(`Subnet overlaps ${t}.`);
|
||||
die(sprintf(_('Subnet overlaps %s.'), t));
|
||||
core.renumber_server(c, m, srv, cidr_str(pc));
|
||||
}
|
||||
return srv;
|
||||
@@ -583,7 +586,7 @@ function server_ports(a) {
|
||||
let m = core.load();
|
||||
let srv = m.servers[a.id];
|
||||
if (!srv)
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
// `networks`: what a new tunnel network must not overlap (everything but this server's own).
|
||||
return { udp_taken: udp_taken(m, srv, srv.wan_zone), tcp_taken: tcp_taken(m),
|
||||
networks: filter(taken_networks(m), (n) => n.cidr != srv.subnet) };
|
||||
@@ -595,7 +598,7 @@ function server_obfuscation(a) {
|
||||
let srv = store.transact((c, m) => {
|
||||
let srv = m.servers[a.id];
|
||||
if (!srv)
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
for (let k in core.OBF_KEYS)
|
||||
c.delete(core.CONFIG, srv.id, k);
|
||||
for (let k, v in o)
|
||||
@@ -611,12 +614,12 @@ function server_obfuscation(a) {
|
||||
/** Remove a server with its people, their devices and its circles (a backup is made first). */
|
||||
function server_delete(a) {
|
||||
if (!core.load().servers[a.id])
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
backup.backup_create('pre-delete');
|
||||
let res = store.transact((c, m) => {
|
||||
let srv = m.servers[a.id];
|
||||
if (!srv)
|
||||
die('Unknown server.');
|
||||
die(_('Unknown server.'));
|
||||
let gone = 0;
|
||||
for (let pid, p in m.people)
|
||||
if (p.server == srv.id) {
|
||||
|
||||
@@ -12,6 +12,7 @@ import * as schema from 'dawnline.schema';
|
||||
import * as health from 'dawnline.health';
|
||||
import * as pc from 'dawnline.portalcert';
|
||||
import { wrap, check_portal, tcp_taken } from 'dawnline.rpc.common';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/** The portal's own checks from Health, shown next to its settings. */
|
||||
const PORTAL_CHECKS = [ 'portal', 'portal_dns', 'portal_reply', 'portal_http', 'cert' ];
|
||||
@@ -92,7 +93,7 @@ function same(a, b) {
|
||||
function settings_update(a) {
|
||||
let v = a.values ?? {};
|
||||
if (type(v) != 'object')
|
||||
die('Nothing to save.');
|
||||
die(_('Nothing to save.'));
|
||||
let res = store.transact((c, m) => {
|
||||
let restart = false;
|
||||
c.set(core.CONFIG, 'settings', 'settings');
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
// people, totals, map, recent activity), the activity log and traffic history.
|
||||
|
||||
import { readfile } from 'fs';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
import { read_json, write_json, ensure_dir, lock, unlock, admin_log, VERSION, RUN_DIR } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as live from 'dawnline.live';
|
||||
@@ -122,7 +123,8 @@ function server_view(m, srv, usage, dmp, rates, days) {
|
||||
mtus: { computer: core.device_mtu(srv, { kind: 'computer' }), phone: core.device_mtu(srv, { kind: 'phone' }) },
|
||||
address: core.server_address(srv), up: !!st.up, uptime: st.uptime ?? 0,
|
||||
// Why the tunnel cannot run (its interface name belongs to another network section), or null.
|
||||
blocked: srv.blocked ?? null,
|
||||
// Why it can't start, as a whole sentence in the admin's language (stored as a code).
|
||||
blocked: awg.blocked_text(srv),
|
||||
// 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,
|
||||
@@ -221,19 +223,19 @@ function logs_clear(a) {
|
||||
let f = {};
|
||||
if (a.person) {
|
||||
if (!m.people[a.person])
|
||||
die('Unknown person.');
|
||||
die(_('Unknown person.'));
|
||||
f.person = a.person;
|
||||
}
|
||||
if (a.device)
|
||||
f.device = a.device;
|
||||
if (a.category) {
|
||||
if (index(live.CATEGORIES, a.category) < 0)
|
||||
die('Unknown category.');
|
||||
die(_('Unknown category.'));
|
||||
f.category = a.category;
|
||||
}
|
||||
if (a.older_days) {
|
||||
if (!match(a.older_days, /^[1-9][0-9]{0,3}$/))
|
||||
die('Older than must be a number of days.');
|
||||
die(_('Older than must be a number of days.'));
|
||||
f.before = time() - +a.older_days * 86400;
|
||||
}
|
||||
let removed = live.clear_events(f);
|
||||
@@ -252,11 +254,11 @@ function logs_clear(a) {
|
||||
function usage_clear(a) {
|
||||
let m = core.load();
|
||||
if (index([ 'all', 'person', 'device' ], a.scope) < 0)
|
||||
die('Unknown scope.');
|
||||
die(_('Unknown scope.'));
|
||||
if (a.scope == 'person' && !m.people[a.id])
|
||||
die('Unknown person.');
|
||||
die(_('Unknown person.'));
|
||||
if (a.scope == 'device' && !m.devices[a.id])
|
||||
die('Unknown device.');
|
||||
die(_('Unknown device.'));
|
||||
let req = { scope: a.scope, id: a.id, ts: time() };
|
||||
ensure_dir(RUN_DIR);
|
||||
let l = lock('usage-reset');
|
||||
|
||||
@@ -11,11 +11,14 @@ import * as upd from 'dawnline.updates';
|
||||
import * as gh from 'dawnline.github';
|
||||
import * as builds from 'dawnline.awg_builds';
|
||||
import { NAMES as PKG_NAMES } from 'dawnline.upd_pkgs';
|
||||
import { langs } from 'dawnline.upd_app';
|
||||
import * as i18n from 'dawnline.i18n';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
const TAG = /^v?[0-9][0-9A-Za-z.+~-]{0,40}$/;
|
||||
// check[:app|amneziawg|packages] | app[@tag|:reinstall|:rollback]
|
||||
// check[:app|amneziawg|packages] | app[@tag|:reinstall|:rollback|:lang:<code>|:nolang]
|
||||
// | amneziawg[:auto|slava|grey[:ru]|:rollback] | pkgs:<name,…> (only packages Dawnline manages)
|
||||
const TARGET = /^(check(:(app|amneziawg|packages))?|app(@v?[0-9][0-9A-Za-z.+~-]{0,40}|:reinstall|:rollback)?|amneziawg(:rollback|:(auto|slava|grey)(:ru)?)?|pkgs:[a-z0-9][a-z0-9.+,-]*)$/;
|
||||
const TARGET = /^(check(:(app|amneziawg|packages))?|app(@v?[0-9][0-9A-Za-z.+~-]{0,40}|:reinstall|:rollback|:lang:[a-z]{2,3}(_[A-Za-z]{2,4})?|:nolang)?|amneziawg(:rollback|:(auto|slava|grey)(:ru)?)?|pkgs:[a-z0-9][a-z0-9.+,-]*)$/;
|
||||
|
||||
function wrap(fn) {
|
||||
return function(req) {
|
||||
@@ -62,6 +65,8 @@ function status(a) {
|
||||
policy: m.settings.updates,
|
||||
auto: upd.auto_state(),
|
||||
kept: upd.kept_all(builds.firmware()?.postfix),
|
||||
// The admin's translations installed (luci-i18n-dawnline-<lang>).
|
||||
translations: langs(),
|
||||
history: slice(upd.history(), 0, 12),
|
||||
tunnels: awg_tunnels(),
|
||||
};
|
||||
@@ -71,7 +76,7 @@ function status(a) {
|
||||
function releases(a) {
|
||||
let page = +(a.page ?? 1);
|
||||
if (page != int(page) || page < 1 || page > 50)
|
||||
die('Unknown page.');
|
||||
die(_('Unknown page.'));
|
||||
return { releases: map(gh.releases(REPO, page), (x) => ({ ...x, body: null, digests: null })), page };
|
||||
}
|
||||
|
||||
@@ -80,12 +85,12 @@ function notes(a) {
|
||||
let rp = a.component == 'amneziawg' ? builds.SOURCES[a.build || 'slava']?.repo : REPO;
|
||||
let tag = a.tag ?? '';
|
||||
if (!rp || !match(tag, TAG))
|
||||
die('Unknown release.');
|
||||
die(_('Unknown release.'));
|
||||
let r = gh.release(rp, tag);
|
||||
if (!r && a.component != 'amneziawg' && substr(tag, 0, 1) != 'v')
|
||||
r = gh.release(rp, `v${tag}`);
|
||||
if (!r)
|
||||
die(`No release ${tag} in ${rp}.`);
|
||||
die(sprintf(_('No release %s in %s.'), tag, rp));
|
||||
return { ...r, digests: null, repo: rp };
|
||||
}
|
||||
|
||||
@@ -93,7 +98,7 @@ function notes(a) {
|
||||
function changes(a) {
|
||||
let to = a.to ?? '', from = a.from ?? '';
|
||||
if (!match(to, TAG) || (from != '' && !match(from, TAG)))
|
||||
die('Unknown release.');
|
||||
die(_('Unknown release.'));
|
||||
// The installed version as a tag when it was released (a build ahead of the releases has none).
|
||||
let base = null;
|
||||
for (let t in (from != '' ? [ `v${replace(from, /^v/, '')}`, replace(from, /^v/, '') ] : []))
|
||||
@@ -109,18 +114,20 @@ function changes(a) {
|
||||
function run(a) {
|
||||
let what = a.what ?? 'check';
|
||||
if (length(what) > 400 || !match(what, TARGET))
|
||||
die('Unknown update target.');
|
||||
die(_('Unknown update target.'));
|
||||
// Checked here too, so a wrong name never becomes a failed job in the history.
|
||||
if (substr(what, 0, 5) == 'pkgs:')
|
||||
for (let n in split(substr(what, 5), ','))
|
||||
if (index(PKG_NAMES, n) < 0)
|
||||
die(n == '' ? 'Unknown update target.' : `${n} is not a package Dawnline manages.`);
|
||||
die(n == '' ? _('Unknown update target.') : sprintf(_('%s is not a package Dawnline manages'), n));
|
||||
if (upd.busy())
|
||||
die('Another component action is already running.');
|
||||
die(_('Another component action is already running'));
|
||||
ensure_dir(RUN_DIR);
|
||||
let t0 = time();
|
||||
let args = substr(what, 0, 5) == 'check' ? `check ${substr(what, 6)}` : `install ${what}`;
|
||||
system(`start-stop-daemon -S -b -x /usr/libexec/dawnline/updater -- ${args}`);
|
||||
// The job speaks the admin's language (use() let only a plain language code through).
|
||||
let lang = i18n.current();
|
||||
system(`${lang ? `DAWNLINE_LANG=${lang} ` : ''}start-stop-daemon -S -b -x /usr/libexec/dawnline/updater -- ${args}`);
|
||||
for (let i = 0; i < 20; i++) {
|
||||
let j = read_json(upd.JOB_FILE, null);
|
||||
if (j?.state == 'running' && j.started >= t0)
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
import { stat } from 'fs';
|
||||
import { ip2int, valid_host, ulength } from 'dawnline.util';
|
||||
import { INTERVALS, TARGETS } from 'dawnline.updates';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/* ---------- addresses ---------- */
|
||||
|
||||
@@ -109,37 +110,36 @@ export function to_int(v, dflt, lo, hi) {
|
||||
/*
|
||||
* type: bool | int | enum | host | hosts | url | file | domain | ipv4 | time | targets
|
||||
* dflt: the parsed default; restart: the portal (uhttpd) must restart when it changes;
|
||||
* min/max: ints; values: enums; msg: the error for a bad value.
|
||||
* min/max: ints; values: enums. The error for a bad value is in messages().
|
||||
*/
|
||||
export const SETTINGS = {
|
||||
portal_enabled: { type: 'bool', dflt: false, restart: true },
|
||||
portal_host: { type: 'host', dflt: '', restart: true, msg: 'Public address must be a hostname or IP address.' },
|
||||
portal_alt: { type: 'hosts', dflt: [], restart: true, msg: 'Other addresses must be hostnames or IP addresses.' },
|
||||
portal_port: { type: 'int', dflt: 8443, min: 1, max: 65535, restart: true,
|
||||
msg: 'Choose a free port between 1 and 65535 (not 22, 53, 80 or 443).' },
|
||||
portal_redirect: { type: 'url', dflt: '', msg: 'Redirect must be a full http:// or https:// address.' },
|
||||
portal_host: { type: 'host', dflt: '', restart: true },
|
||||
portal_alt: { type: 'hosts', dflt: [], restart: true },
|
||||
portal_port: { type: 'int', dflt: 8443, min: 1, max: 65535, restart: true },
|
||||
portal_redirect: { type: 'url', dflt: '' },
|
||||
portal_cert: { type: 'file', dflt: '', restart: true },
|
||||
portal_key: { type: 'file', dflt: '', restart: true },
|
||||
default_device_limit: { type: 'int', dflt: 3, min: 1, max: 32, msg: 'Default device limit must be 1-32.' },
|
||||
default_device_limit: { type: 'int', dflt: 3, min: 1, max: 32 },
|
||||
hostnames: { type: 'bool', dflt: true },
|
||||
domain: { type: 'domain', dflt: 'lan', msg: 'Domain may use lowercase letters, digits, dashes and dots.' },
|
||||
domain: { type: 'domain', dflt: 'lan' },
|
||||
// Off until the admin turns it on: lookups send people's addresses to a third party.
|
||||
geo_enabled: { type: 'bool', dflt: false },
|
||||
geo_provider: { type: 'enum', dflt: 'ipwho.is', values: [ 'ipwho.is', 'ipapi.co' ], msg: 'Unknown location service.' },
|
||||
geo_provider: { type: 'enum', dflt: 'ipwho.is', values: [ 'ipwho.is', 'ipapi.co' ] },
|
||||
log_connections: { type: 'bool', dflt: true },
|
||||
watchdog: { type: 'bool', dflt: true },
|
||||
log_keep_days: { type: 'int', dflt: 30, min: 0, max: 9999, msg: 'Keep activity for 0 (no age limit) to 9999 days.' },
|
||||
log_max: { type: 'int', dflt: 2000, min: 100, max: 20000, msg: 'Log size must be 100-20000 events.' },
|
||||
log_persist: { type: 'enum', dflt: 'hourly', values: [ '10min', 'hourly', 'off' ], msg: 'Save the log every 10min, hourly or off.' },
|
||||
usage_keep_days: { type: 'int', dflt: 62, min: 7, max: 1830, msg: 'Daily traffic history must be 7-1830 days.' },
|
||||
usage_keep_months: { type: 'int', dflt: 24, min: 1, max: 120, msg: 'Monthly traffic history must be 1-120 months.' },
|
||||
log_keep_days: { type: 'int', dflt: 30, min: 0, max: 9999 },
|
||||
log_max: { type: 'int', dflt: 2000, min: 100, max: 20000 },
|
||||
log_persist: { type: 'enum', dflt: 'hourly', values: [ '10min', 'hourly', 'off' ] },
|
||||
usage_keep_days: { type: 'int', dflt: 62, min: 7, max: 1830 },
|
||||
usage_keep_months: { type: 'int', dflt: 24, min: 1, max: 120 },
|
||||
// Empty means "no fallback" (stored as 'none'); unset means the default.
|
||||
home_dns_fallback: { type: 'ipv4', dflt: '1.1.1.1', msg: 'Fallback DNS must be an IPv4 address (or empty for none).' },
|
||||
home_dns_fallback: { type: 'ipv4', dflt: '1.1.1.1' },
|
||||
update_check: { type: 'bool', dflt: true },
|
||||
update_interval: { type: 'enum', dflt: '1d', values: keys(INTERVALS), msg: 'Check every 6h, 12h, 1d or 7d.' },
|
||||
update_interval: { type: 'enum', dflt: '1d', values: keys(INTERVALS) },
|
||||
update_auto: { type: 'bool', dflt: true },
|
||||
update_mode: { type: 'enum', dflt: 'scheduled', values: [ 'immediate', 'scheduled' ], msg: 'Install updates immediately or scheduled.' },
|
||||
update_time: { type: 'time', dflt: '04:00', msg: 'Enter a time as HH:MM, 00:00 to 23:59.' },
|
||||
update_mode: { type: 'enum', dflt: 'scheduled', values: [ 'immediate', 'scheduled' ] },
|
||||
update_time: { type: 'time', dflt: '04:00' },
|
||||
update_targets: { type: 'targets', dflt: [ 'app', 'packages' ] },
|
||||
update_keep: { type: 'bool', dflt: false },
|
||||
update_mirrors: { type: 'bool', dflt: true },
|
||||
@@ -148,8 +148,30 @@ export const SETTINGS = {
|
||||
/** Ports the portal never takes: SSH, DNS and the LuCI web server. */
|
||||
export const RESERVED_PORTS = [ 22, 53, 80, 443 ];
|
||||
|
||||
function bad(spec, key) {
|
||||
die(spec.msg ?? `Invalid value for ${key}.`);
|
||||
/** What the admin is told about a bad value, by setting (made per call: the language changes between calls). */
|
||||
function messages() {
|
||||
return {
|
||||
portal_host: _('Public address must be a hostname or IP address.'),
|
||||
portal_alt: _('Other addresses must be hostnames or IP addresses.'),
|
||||
portal_port: _('Choose a free port between 1 and 65535 (not 22, 53, 80 or 443).'),
|
||||
portal_redirect: _('Redirect must be a full http:// or https:// address.'),
|
||||
default_device_limit: _('Default device limit must be 1-32.'),
|
||||
domain: _('Domain may use lowercase letters, digits, dashes and dots.'),
|
||||
geo_provider: _('Unknown location service.'),
|
||||
log_keep_days: _('Keep activity for 0 (no age limit) to 9999 days.'),
|
||||
log_max: _('Log size must be 100-20000 events.'),
|
||||
log_persist: _('Save the log every 10min, hourly or off.'),
|
||||
usage_keep_days: _('Daily traffic history must be 7-1830 days.'),
|
||||
usage_keep_months: _('Monthly traffic history must be 1-120 months.'),
|
||||
home_dns_fallback: _('Fallback DNS must be an IPv4 address (or empty for none).'),
|
||||
update_interval: _('Check every 6h, 12h, 1d or 7d.'),
|
||||
update_mode: _('Install updates immediately or scheduled.'),
|
||||
update_time: _('Enter a time as HH:MM, 00:00 to 23:59.'),
|
||||
};
|
||||
}
|
||||
|
||||
function bad(key) {
|
||||
die(messages()[key] ?? sprintf(_('Invalid value for %s.'), key));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -160,14 +182,14 @@ function bad(spec, key) {
|
||||
export function validate(key, val) {
|
||||
let spec = SETTINGS[key];
|
||||
if (!spec)
|
||||
die(`Unknown setting ${key}.`);
|
||||
die(sprintf(_('Unknown setting %s.'), key));
|
||||
let t = spec.type;
|
||||
if (t == 'hosts') {
|
||||
let lst = [];
|
||||
for (let x in (type(val) == 'array' ? val : [])) {
|
||||
// A typo must not vanish on Save: refused, like the main address.
|
||||
if (type(x) != 'string' || (trim(x) != '' && !valid_host(trim(x))))
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
if (trim(x) != '' && index(lst, trim(x)) < 0)
|
||||
push(lst, trim(x));
|
||||
}
|
||||
@@ -190,40 +212,40 @@ export function validate(key, val) {
|
||||
return null;
|
||||
if (t == 'bool') {
|
||||
if (val != '0' && val != '1')
|
||||
die(`${key} is 0 or 1.`);
|
||||
die(sprintf(_('%s is 0 or 1.'), key));
|
||||
}
|
||||
else if (t == 'int') {
|
||||
if (!match(val, /^[0-9]{1,9}$/) || +val < spec.min || +val > spec.max)
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
val = `${+val}`;
|
||||
}
|
||||
else if (t == 'enum') {
|
||||
if (index(spec.values, val) < 0)
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
}
|
||||
else if (t == 'host') {
|
||||
if (!valid_host(val))
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
}
|
||||
else if (t == 'url') {
|
||||
if (length(val) > 300 || !match(val, /^https?:\/\/[A-Za-z0-9.-]+(:[0-9]+)?(\/[^[:space:]"'<>]*)?$/))
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
}
|
||||
else if (t == 'file') {
|
||||
if (substr(val, 0, 1) != '/' || !stat(val))
|
||||
die(`${val} does not exist.`);
|
||||
die(sprintf(_('File %s does not exist.'), val));
|
||||
}
|
||||
else if (t == 'domain') {
|
||||
if (!match(val, /^[a-z0-9-]{1,32}(\.[a-z0-9-]{1,32})*$/))
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
}
|
||||
else if (t == 'ipv4') {
|
||||
if (!ipv4(val))
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
}
|
||||
else if (t == 'time') {
|
||||
if (!match(val, /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/))
|
||||
bad(spec, key);
|
||||
bad(key);
|
||||
}
|
||||
return val;
|
||||
};
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
import { lock, unlock } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
/** Section names that are never ids of people, devices, servers, services or circles. */
|
||||
export const RESERVED_IDS = [ 'settings', 'main', 'global', 'defaults' ];
|
||||
@@ -15,8 +16,11 @@ export const RESERVED_IDS = [ 'settings', 'main', 'global', 'defaults' ];
|
||||
* caller's change never happened, and nothing downstream may act on it.
|
||||
*/
|
||||
export function commit(c) {
|
||||
if (!c.commit(core.CONFIG))
|
||||
die(`Couldn't save /etc/config/dawnline: ${c.error() ?? 'the write failed'}. Is the flash full?`);
|
||||
if (!c.commit(core.CONFIG)) {
|
||||
let why = c.error();
|
||||
die(why != null ? sprintf(_("Couldn't save /etc/config/dawnline: %s. Is the flash full?"), why)
|
||||
: _("Couldn't save /etc/config/dawnline: the write failed. Is the flash full?"));
|
||||
}
|
||||
system('chmod 600 /etc/config/dawnline');
|
||||
};
|
||||
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
// Dawnline updater: Dawnline itself — check the latest release, install a
|
||||
// release (latest, a tag, the same one again) or the kept previous version.
|
||||
// The admin's translations installed on the router (luci-i18n-dawnline-<lang>)
|
||||
// come from the same release and go in with it, in one transaction.
|
||||
// ctx is the updater's job context (see usr/libexec/dawnline/updater).
|
||||
|
||||
import { readfile } from 'fs';
|
||||
import { readfile, lsdir } from 'fs';
|
||||
import { VERSION, REPO } from 'dawnline.util';
|
||||
import * as upd from 'dawnline.updates';
|
||||
import * as gh from 'dawnline.github';
|
||||
import * as pkg from 'dawnline.pkg';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
function status(installed, latest) {
|
||||
let c = upd.version_cmp(installed, latest);
|
||||
@@ -16,12 +19,12 @@ function status(installed, latest) {
|
||||
export function check(ctx) {
|
||||
let r = gh.latest(REPO);
|
||||
if (!r)
|
||||
return { installed: VERSION, latest: null, update: false, repo: REPO, status: '', note: `Cannot reach github.com/${REPO}` };
|
||||
return { installed: VERSION, latest: null, update: false, repo: REPO, status: '', note: sprintf(_('Cannot reach github.com/%s'), REPO) };
|
||||
let latest = replace(r.tag, /^v/, '');
|
||||
let st = status(VERSION, latest);
|
||||
ctx.log(st == 'outdated' ? `Dawnline update is available: ${VERSION} → ${latest}`
|
||||
: st == 'dev' ? `Installed Dawnline ${VERSION} is newer than the release ${latest}`
|
||||
: `Dawnline is up to date (${VERSION})`);
|
||||
ctx.log(st == 'outdated' ? sprintf(_('Dawnline update is available: %s → %s'), VERSION, latest)
|
||||
: st == 'dev' ? sprintf(_('Installed Dawnline %s is newer than the release %s'), VERSION, latest)
|
||||
: sprintf(_('Dawnline is up to date (%s)'), VERSION));
|
||||
return { installed: VERSION, latest, tag: r.tag, repo: REPO, url: r.url, published: r.published, update: st == 'outdated', status: st };
|
||||
};
|
||||
|
||||
@@ -44,21 +47,51 @@ function want_sha(ctx, tag, asset, dir) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Download a release's package, verified against its sha256. */
|
||||
function fetch(ctx, tag, dir) {
|
||||
let ver = replace(tag, /^v/, '');
|
||||
let asset = `luci-app-dawnline-${ver}.${pkg.ext()}`;
|
||||
ctx.phase(`Downloading ${asset}`);
|
||||
/** The languages of the translations installed here, by their catalogs (dawnline.<lang>.lmo). */
|
||||
export function langs() {
|
||||
let out = [];
|
||||
for (let f in lsdir('/usr/lib/lua/luci/i18n') ?? []) {
|
||||
let m = match(f, /^dawnline\.([A-Za-z_-]+)\.lmo$/);
|
||||
if (m)
|
||||
push(out, m[1]);
|
||||
}
|
||||
return sort(out);
|
||||
};
|
||||
|
||||
const i18n_pkg = (lang) => `luci-i18n-dawnline-${lang}`;
|
||||
|
||||
/**
|
||||
* Download one file of a release, verified against its sha256. `optional`: a
|
||||
* release without it (one from before the translations) gives null.
|
||||
*/
|
||||
function fetch_file(ctx, tag, asset, dir, optional) {
|
||||
ctx.phase(sprintf(_('Downloading %s'), asset));
|
||||
let want = want_sha(ctx, tag, asset, dir);
|
||||
if (!want && optional) {
|
||||
ctx.log(sprintf(_('Release %s has no %s: it stays as it is'), tag, asset));
|
||||
return null;
|
||||
}
|
||||
if (!want)
|
||||
die(`Release ${tag} publishes no checksum for ${asset}: not installing an unverified package`);
|
||||
die(sprintf(_('Release %s publishes no checksum for %s: not installing an unverified package'), tag, asset));
|
||||
let f = `${dir}/${asset}`;
|
||||
if (!gh.download(`https://github.com/${REPO}/releases/download/${tag}/${asset}`, f, { sha256: want, mirrors: ctx.pol.mirrors, log: ctx.log }))
|
||||
die(`Download failed: ${asset}`);
|
||||
ctx.log(`sha256 matches the release (${substr(want, 0, 12)}…)`);
|
||||
die(sprintf(_('Download failed: %s'), asset));
|
||||
ctx.log(sprintf(_('sha256 matches the release (%s…)'), substr(want, 0, 12)));
|
||||
return f;
|
||||
}
|
||||
|
||||
/** A release's package and the translations installed here, verified. */
|
||||
function fetch(ctx, tag, dir) {
|
||||
let ver = replace(tag, /^v/, '');
|
||||
let files = [ fetch_file(ctx, tag, `luci-app-dawnline-${ver}.${pkg.ext()}`, dir) ];
|
||||
for (let l in langs()) {
|
||||
let f = fetch_file(ctx, tag, `${i18n_pkg(l)}-${ver}.${pkg.ext()}`, dir, true);
|
||||
if (f)
|
||||
push(files, f);
|
||||
}
|
||||
return files;
|
||||
}
|
||||
|
||||
/** The release tag of a version: tags may or may not carry the v. */
|
||||
function tag_of(ver) {
|
||||
for (let t in [ `v${ver}`, ver ]) {
|
||||
@@ -72,23 +105,54 @@ function tag_of(ver) {
|
||||
}
|
||||
|
||||
function backup(ctx) {
|
||||
ctx.phase('Backing up configuration');
|
||||
ctx.phase(_('Backing up configuration'));
|
||||
system('/usr/bin/dawnline backup --reason pre-update >/dev/null 2>&1');
|
||||
}
|
||||
|
||||
/** arg: null (latest) | @<tag> | reinstall | rollback */
|
||||
/**
|
||||
* Add the translation `lang` of the installed version from its release, or
|
||||
* (lang null) remove the installed ones. LuCI reads its catalogs once per web
|
||||
* server process: it restarts after the job.
|
||||
*/
|
||||
function set_lang(ctx, lang) {
|
||||
if (lang == null) {
|
||||
let have = map(langs(), i18n_pkg);
|
||||
if (length(have)) {
|
||||
ctx.phase(_('Removing the translation'));
|
||||
if (!pkg.remove(have, ctx.log))
|
||||
die(_('The translation could not be removed'));
|
||||
}
|
||||
}
|
||||
else {
|
||||
let tag = tag_of(VERSION);
|
||||
let f = fetch_file(ctx, tag, `${i18n_pkg(lang)}-${VERSION}.${pkg.ext()}`, ctx.work, true);
|
||||
if (!f)
|
||||
die(sprintf(_('Release %s has no translation into %s: install a release that has one'), tag, lang));
|
||||
ctx.phase(_('Installing the translation'));
|
||||
if (!pkg.install_files([ f ], false, ctx.log))
|
||||
die(_('Installation failed'));
|
||||
}
|
||||
ctx.after('luci');
|
||||
return { from: VERSION, to: VERSION, lang };
|
||||
}
|
||||
|
||||
/** arg: null (latest) | @<tag> | reinstall | rollback | lang:<code> | nolang */
|
||||
export function install(ctx, arg) {
|
||||
if (arg == 'nolang')
|
||||
return set_lang(ctx, null);
|
||||
if (substr(arg ?? '', 0, 5) == 'lang:')
|
||||
return set_lang(ctx, substr(arg, 5));
|
||||
let out = { from: VERSION, to: null };
|
||||
if (arg == 'rollback') {
|
||||
let k = upd.kept('app');
|
||||
if (!k)
|
||||
die('No previous Dawnline version is kept on the router');
|
||||
die(_('No previous Dawnline version is kept on the router'));
|
||||
out.to = k.version;
|
||||
ctx.versions(VERSION, k.version);
|
||||
backup(ctx);
|
||||
ctx.phase(`Rolling back to ${k.version}`);
|
||||
ctx.phase(sprintf(_('Rolling back to %s'), k.version));
|
||||
if (!pkg.install_files(k.files, true, ctx.log))
|
||||
die('Installation failed');
|
||||
die(_('Installation failed'));
|
||||
upd.forget('app');
|
||||
ctx.after('app');
|
||||
return out;
|
||||
@@ -114,25 +178,25 @@ export function install(ctx, arg) {
|
||||
}
|
||||
out.to = replace(tag, /^v/, '');
|
||||
ctx.versions(VERSION, out.to);
|
||||
let f = fetch(ctx, tag, ctx.work);
|
||||
let files = fetch(ctx, tag, ctx.work);
|
||||
// The version being replaced, for Roll back (downloaded again: opkg keeps
|
||||
// no package files). Always for an automatic run: nobody is there to
|
||||
// recover a router whose new version does not come up (postupdate rolls
|
||||
// back to it on its own).
|
||||
if ((ctx.pol.keep || ctx.auto?.()) && out.to != VERSION && upd.kept('app')?.version != VERSION) {
|
||||
ctx.phase(`Keeping Dawnline ${VERSION} for rollback`);
|
||||
ctx.phase(sprintf(_('Keeping Dawnline %s for rollback'), VERSION));
|
||||
try {
|
||||
system(`mkdir -p '${ctx.work}/keep'`);
|
||||
upd.keep('app', VERSION, [ fetch(ctx, tag_of(VERSION), `${ctx.work}/keep`) ]);
|
||||
upd.keep('app', VERSION, fetch(ctx, tag_of(VERSION), `${ctx.work}/keep`));
|
||||
}
|
||||
catch (e) {
|
||||
ctx.log(`Warning: could not keep ${VERSION}: ${e.message}`);
|
||||
ctx.log(sprintf(_('Warning: could not keep %s: %s'), VERSION, e.message));
|
||||
}
|
||||
}
|
||||
backup(ctx);
|
||||
ctx.phase('Installing package');
|
||||
if (!pkg.install_files([ f ], force, ctx.log))
|
||||
die('Installation failed');
|
||||
ctx.phase(_('Installing package'));
|
||||
if (!pkg.install_files(files, force, ctx.log))
|
||||
die(_('Installation failed'));
|
||||
ctx.after('app');
|
||||
return out;
|
||||
};
|
||||
@@ -10,6 +10,7 @@ import * as upd from 'dawnline.updates';
|
||||
import * as gh from 'dawnline.github';
|
||||
import * as pkg from 'dawnline.pkg';
|
||||
import * as builds from 'dawnline.awg_builds';
|
||||
import { _, N_ } from 'dawnline.i18n';
|
||||
|
||||
function sh(cmd) {
|
||||
return system(`${cmd} >/dev/null 2>&1`);
|
||||
@@ -51,16 +52,16 @@ export function check(ctx) {
|
||||
let fw = builds.firmware();
|
||||
if (!fw)
|
||||
return { installed: cur, gen: builds.gen(cur), packages: installed, current: null, ru, sources: {}, update: false, status: '',
|
||||
note: 'Cannot detect the firmware target' };
|
||||
note: _('Cannot detect the firmware target') };
|
||||
if (fw.snapshot)
|
||||
return { installed: cur, gen: builds.gen(cur), packages: installed, current: null, ru, sources: {}, update: false, status: '',
|
||||
note: 'This is a SNAPSHOT firmware: the AmneziaWG projects publish builds for releases only' };
|
||||
note: _('This is a SNAPSHOT firmware: the AmneziaWG projects publish builds for releases only') };
|
||||
let dir = `${ctx.work}/check`;
|
||||
system(`mkdir -p '${dir}'`);
|
||||
let sources = {};
|
||||
for (let id in builds.ORDER) {
|
||||
let src = builds.SOURCES[id];
|
||||
ctx.log(`Looking for the ${src.label} build for OpenWrt ${substr(fw.tag, 1)}`);
|
||||
ctx.log(sprintf(_('Looking for the %s build for OpenWrt %s'), src.label, substr(fw.tag, 1)));
|
||||
let f = fetch(ctx, fw, 'amneziawg-tools', id, dir);
|
||||
let v = f ? pkg.file_version(f) : null;
|
||||
let date = null;
|
||||
@@ -89,16 +90,16 @@ export function check(ctx) {
|
||||
let mine = current ? sources[current] : null;
|
||||
let c = cur && mine?.version ? pkg.cmp(cur, mine.version) : null;
|
||||
let st = c == null ? '' : c < 0 ? 'outdated' : c > 0 ? 'dev' : 'latest';
|
||||
ctx.log(cur == null ? 'AmneziaWG is not installed'
|
||||
: !current ? `AmneziaWG ${cur}: no source publishes this build for this firmware any more`
|
||||
: st == 'outdated' ? `AmneziaWG update is available: ${cur} → ${mine.version}`
|
||||
: `AmneziaWG is up to date (${cur})`);
|
||||
ctx.log(cur == null ? _('AmneziaWG is not installed')
|
||||
: !current ? sprintf(_('AmneziaWG %s: no source publishes this build for this firmware any more'), cur)
|
||||
: st == 'outdated' ? sprintf(_('AmneziaWG update is available: %s → %s'), cur, mine.version)
|
||||
: sprintf(_('AmneziaWG is up to date (%s)'), cur));
|
||||
return { installed: cur, gen: builds.gen(cur), packages: installed, current, ru, release: fw.tag, sources,
|
||||
latest: mine?.version ?? null, status: st,
|
||||
update: cur == null || st == 'outdated',
|
||||
// An update that changes the generation (2.0 → 3.1) breaks older apps: never automatic.
|
||||
gen_change: cur != null && mine?.version != null && builds.gen(cur) != builds.gen(mine.version),
|
||||
note: !length(filter(values(sources), (x) => x.version)) ? `No AmneziaWG build for OpenWrt ${substr(fw.tag, 1)} yet` : null };
|
||||
note: !length(filter(values(sources), (x) => x.version)) ? sprintf(_('No AmneziaWG build for OpenWrt %s yet'), substr(fw.tag, 1)) : null };
|
||||
};
|
||||
|
||||
/** Tunnels on a new kernel module: every AmneziaWG interface is brought down and up again. */
|
||||
@@ -112,7 +113,8 @@ function reload_module(ctx, before, after) {
|
||||
if (s.proto == 'amneziawg' && s.disabled != '1')
|
||||
push(ifaces, s['.name']);
|
||||
});
|
||||
ctx.phase(`Reloading the kernel module (${length(ifaces)} tunnel(s) restart)`);
|
||||
let n = length(ifaces);
|
||||
ctx.phase(sprintf(N_(n, 'Reloading the kernel module (%d tunnel restarts)', 'Reloading the kernel module (%d tunnels restart)'), n));
|
||||
for (let i in ifaces) {
|
||||
iface_intent(i, 'update', c.get('network', i, '_dawnline_name') ?? i);
|
||||
sh(`ifdown '${i}'`);
|
||||
@@ -121,10 +123,10 @@ function reload_module(ctx, before, after) {
|
||||
// no module at all) leave every tunnel down while the job says "done".
|
||||
ctx.run('rmmod amneziawg');
|
||||
if (stat('/sys/module/amneziawg'))
|
||||
die('The old AmneziaWG kernel module is still loaded (another AmneziaWG interface may use it): reboot the router to finish the update');
|
||||
die(_('The old AmneziaWG kernel module is still loaded (another AmneziaWG interface may use it): reboot the router to finish the update'));
|
||||
ctx.run('modprobe amneziawg');
|
||||
if (!stat('/sys/module/amneziawg'))
|
||||
die("The new AmneziaWG kernel module doesn't load on this firmware: the tunnels stay down until it does (see the log above)");
|
||||
die(_("The new AmneziaWG kernel module doesn't load on this firmware: the tunnels stay down until it does (see the log above)"));
|
||||
for (let i in ifaces)
|
||||
sh(`ifup '${i}'`);
|
||||
}
|
||||
@@ -132,15 +134,15 @@ function reload_module(ctx, before, after) {
|
||||
/** After packages changed: the module loaded, netifd knowing the protocol, Dawnline set up again. */
|
||||
function settle(ctx, before, after) {
|
||||
if (!before['kmod-amneziawg'] && after['kmod-amneziawg']) {
|
||||
ctx.phase('Loading the kernel module');
|
||||
ctx.phase(_('Loading the kernel module'));
|
||||
if (ctx.run('modprobe amneziawg').code != 0 && !stat('/sys/module/amneziawg'))
|
||||
die("AmneziaWG is installed, but its kernel module doesn't load on this firmware");
|
||||
die(_("AmneziaWG is installed, but its kernel module doesn't load on this firmware"));
|
||||
}
|
||||
else
|
||||
reload_module(ctx, before, after);
|
||||
// netifd reads its protocol handlers when it starts.
|
||||
if (index(ctx.run('ubus call network get_proto_handlers').out, '"amneziawg"') < 0) {
|
||||
ctx.phase('Restarting the network so it knows AmneziaWG (connections drop for a few seconds)');
|
||||
ctx.phase(_('Restarting the network so it knows AmneziaWG (connections drop for a few seconds)'));
|
||||
ctx.run('/etc/init.d/network restart');
|
||||
}
|
||||
ctx.after('apply');
|
||||
@@ -166,19 +168,19 @@ export function install(ctx, arg) {
|
||||
let out = { from: before['amneziawg-tools'], to: null, before };
|
||||
let fw = builds.firmware();
|
||||
if (!fw)
|
||||
die('Cannot detect the firmware target');
|
||||
die(_('Cannot detect the firmware target'));
|
||||
if (arg == 'rollback') {
|
||||
let k = upd.kept('amneziawg');
|
||||
if (!k)
|
||||
die('No previous AmneziaWG build is kept on the router');
|
||||
die(_('No previous AmneziaWG build is kept on the router'));
|
||||
if (k.firmware && k.firmware != fw.postfix)
|
||||
die('The kept AmneziaWG build was made for another firmware: it would not load on this one');
|
||||
die(_('The kept AmneziaWG build was made for another firmware: it would not load on this one'));
|
||||
out.to = k.version;
|
||||
out.build = k.build;
|
||||
ctx.versions(out.from, out.to);
|
||||
ctx.phase(`Rolling back to ${k.version}`);
|
||||
ctx.phase(sprintf(_('Rolling back to %s'), k.version));
|
||||
if (!pkg.install_files(k.files, true, ctx.log))
|
||||
die('Package installation failed');
|
||||
die(_('Package installation failed'));
|
||||
upd.forget('amneziawg');
|
||||
out.after = builds.installed();
|
||||
settle(ctx, before, out.after);
|
||||
@@ -190,18 +192,18 @@ export function install(ctx, arg) {
|
||||
if (id == 'auto') {
|
||||
id = pick(fw);
|
||||
if (!id)
|
||||
die(`No AmneziaWG build for OpenWrt ${substr(fw.tag, 1)} (${fw.postfix}) yet`);
|
||||
die(sprintf(_('No AmneziaWG build for OpenWrt %s (%s) yet'), substr(fw.tag, 1), fw.postfix));
|
||||
}
|
||||
let src = builds.SOURCES[id];
|
||||
if (!src)
|
||||
die(`Unknown AmneziaWG build ${id}`);
|
||||
die(sprintf(_('Unknown AmneziaWG build %s'), id));
|
||||
out.build = id;
|
||||
let files = [];
|
||||
for (let p in [ ...builds.PKGS, ...(want_ru ? [ builds.RU ] : []) ]) {
|
||||
ctx.phase(`Downloading ${p} from ${src.repo}`);
|
||||
ctx.phase(sprintf(_('Downloading %s from %s'), p, src.repo));
|
||||
let f = fetch(ctx, fw, p, id, ctx.work);
|
||||
if (!f)
|
||||
die(`No ${p} build for OpenWrt ${substr(fw.tag, 1)} in ${src.repo}, or it could not be verified`);
|
||||
die(sprintf(_('No %s build for OpenWrt %s in %s, or it could not be verified'), p, substr(fw.tag, 1), src.repo));
|
||||
push(files, f);
|
||||
}
|
||||
out.to = pkg.file_version(files[1]);
|
||||
@@ -219,19 +221,19 @@ export function install(ctx, arg) {
|
||||
kept = sid;
|
||||
}
|
||||
if (kept) {
|
||||
ctx.phase(`Keeping AmneziaWG ${out.from} for rollback`);
|
||||
ctx.phase(sprintf(_('Keeping AmneziaWG %s for rollback'), out.from));
|
||||
let keepf = filter(map(builds.PKGS, (p) => fetch(ctx, fw, p, kept, dir)), (x) => x);
|
||||
if (length(keepf) == length(builds.PKGS))
|
||||
upd.keep('amneziawg', out.from, keepf, kept, fw.postfix);
|
||||
}
|
||||
else
|
||||
ctx.log('Warning: the installed build is no longer published, nothing to keep for rollback');
|
||||
ctx.log(_('Warning: the installed build is no longer published, nothing to keep for rollback'));
|
||||
}
|
||||
ctx.phase('Refreshing package lists');
|
||||
ctx.phase(_('Refreshing package lists'));
|
||||
pkg.refresh(ctx.log);
|
||||
ctx.phase(`Installing the ${src.label} build`);
|
||||
ctx.phase(sprintf(_('Installing the %s build'), src.label));
|
||||
if (!pkg.install_files(files, true, ctx.log))
|
||||
die('Package installation failed');
|
||||
die(_('Package installation failed'));
|
||||
if (!want_ru && pkg.version(builds.RU))
|
||||
pkg.remove([ builds.RU ], ctx.log);
|
||||
out.after = builds.installed();
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
// ctx is the updater's job context (see usr/libexec/dawnline/updater).
|
||||
|
||||
import * as pkg from 'dawnline.pkg';
|
||||
import { _, N_ } from 'dawnline.i18n';
|
||||
|
||||
/** What Dawnline itself adds to OpenWrt (the rest of LuCI, ucode, rpcd and uhttpd is the stock system). */
|
||||
export const NAMES = [ 'ip-full', 'kmod-veth', 'libustream-openssl', 'openssl-util', 'acme', 'acme-acmesh-dnsapi', 'luci-app-acme' ];
|
||||
@@ -41,7 +42,7 @@ function with_family(names, up) {
|
||||
/** refresh: update the package lists first (a check by hand or on schedule). */
|
||||
export function check(ctx, refresh) {
|
||||
if (refresh ?? true) {
|
||||
ctx.phase('Refreshing package lists');
|
||||
ctx.phase(_('Refreshing package lists'));
|
||||
pkg.refresh();
|
||||
}
|
||||
let up = pkg.upgradable();
|
||||
@@ -54,7 +55,8 @@ export function check(ctx, refresh) {
|
||||
all[x] = true;
|
||||
}
|
||||
let n = length(keys(all));
|
||||
ctx.log(n ? `${n} package update${n == 1 ? '' : 's'} in the feeds: ${join(', ', sort(keys(all)))}` : 'System packages are up to date');
|
||||
ctx.log(n ? sprintf(N_(n, '%d package update in the feeds: %s', '%d package updates in the feeds: %s'), n, join(', ', sort(keys(all))))
|
||||
: _('System packages are up to date'));
|
||||
return { pkgs: res, updates: n, status: n ? 'outdated' : 'latest' };
|
||||
};
|
||||
|
||||
@@ -63,22 +65,22 @@ export function install(ctx, arg) {
|
||||
let names = filter(split(arg ?? '', ','), (x) => x != '');
|
||||
for (let n in names)
|
||||
if (index(NAMES, n) < 0)
|
||||
die(`${n} is not a package Dawnline manages`);
|
||||
die(sprintf(_('%s is not a package Dawnline manages'), n));
|
||||
if (!length(names))
|
||||
die('Nothing to install');
|
||||
ctx.phase('Refreshing package lists');
|
||||
die(_('Nothing to install'));
|
||||
ctx.phase(_('Refreshing package lists'));
|
||||
pkg.refresh(ctx.log);
|
||||
let missing = filter(names, (n) => pkg.version(n) == null);
|
||||
let have = with_family(filter(names, (n) => pkg.version(n) != null), pkg.upgradable());
|
||||
if (length(have)) {
|
||||
ctx.phase(`Updating ${join(', ', have)}`);
|
||||
ctx.phase(sprintf(_('Updating %s'), join(', ', have)));
|
||||
if (!pkg.upgrade(have, ctx.log))
|
||||
die('Update failed');
|
||||
die(_('Update failed'));
|
||||
}
|
||||
if (length(missing)) {
|
||||
ctx.phase(`Installing ${join(', ', missing)}`);
|
||||
ctx.phase(sprintf(_('Installing %s'), join(', ', missing)));
|
||||
if (!pkg.add(missing, ctx.log))
|
||||
die('Installation failed');
|
||||
die(_('Installation failed'));
|
||||
}
|
||||
// The portal's HTTPS runs in uhttpd; a piece that just arrived lets the portal or the home-like link start.
|
||||
let touched = [ ...missing, ...have ];
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
import { open, stat } from 'fs';
|
||||
import { q, read_json, write_json, ensure_dir, RUN_DIR, DATA_DIR } from 'dawnline.util';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
export const JOB_FILE = `${RUN_DIR}/update-job.json`;
|
||||
export const CHECK_FILE = `${RUN_DIR}/update-check.json`;
|
||||
@@ -126,12 +127,16 @@ export function busy() {
|
||||
return false;
|
||||
};
|
||||
|
||||
/** The last job; a "running" one whose worker is gone (the lock is free) reads as failed. */
|
||||
/**
|
||||
* The last job; a "running" one whose worker is gone (the lock is free) reads
|
||||
* as failed. Its phases, log and error are in the language of whoever started
|
||||
* it (English for automatic runs); only the stopped-job error is made here.
|
||||
*/
|
||||
export function job() {
|
||||
let j = read_json(JOB_FILE, null);
|
||||
if (j?.state == 'running' && !busy()) {
|
||||
j.state = 'failed';
|
||||
j.error = 'The update stopped unexpectedly.';
|
||||
j.error = _('The update stopped unexpectedly.');
|
||||
j.finished = j.finished ?? time();
|
||||
}
|
||||
return j;
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
// helpers work on a cursor the caller owns).
|
||||
|
||||
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
export const VERSION = '0.10.0';
|
||||
export const VERSION = '0.11.0';
|
||||
/** GitHub repository with Dawnline releases (updates and the installer). */
|
||||
export const REPO = 'tickcount/luci-app-dawnline';
|
||||
export const RUN_DIR = '/var/run/dawnline';
|
||||
@@ -543,8 +544,10 @@ export function valid_name(s) {
|
||||
return type(s) == 'string' && ulength(trim(s)) > 0 && ulength(s) <= 48 && match(s, /[<>"\\[:cntrl:]]/) == null;
|
||||
};
|
||||
|
||||
/** What valid_name wants, for the admin. */
|
||||
export const NAME_RULE = 'Enter a name: up to 48 characters, without < > " or \\.';
|
||||
/** What valid_name wants, for the admin (in the admin's language). */
|
||||
export function name_rule() {
|
||||
return _('Enter a name: up to 48 characters, without < > " or \\.');
|
||||
};
|
||||
|
||||
export function valid_key(s) {
|
||||
return type(s) == 'string' && match(s, /^[A-Za-z0-9+\/]{42}[AEIMQUYcgkosw048]=$/) != null;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
// Dawnline — watchdog. The agent runs it every minute: it checks what keeps
|
||||
// people connected and repairs what it can, waiting longer after each repair
|
||||
// that did not help. What it finds goes to the service log; its state to
|
||||
// RUN_DIR for the Health page. A cron job (libexec/dawnline/heartbeat) looks
|
||||
// after the agent itself.
|
||||
// that did not help. What it finds goes to the service log (English, as
|
||||
// logged); its state to RUN_DIR for the Health page, whose chip names are put
|
||||
// in the admin's language when they are read (view()). A cron job
|
||||
// (libexec/dawnline/heartbeat) looks after the agent itself.
|
||||
|
||||
import { stat } from 'fs';
|
||||
import { _, L_ } from 'dawnline.i18n';
|
||||
import { sh_out, q, read_json, write_json, slog, slog_read, RUN_DIR } from 'dawnline.util';
|
||||
import * as apply from 'dawnline.apply';
|
||||
import * as loop from 'dawnline.loop';
|
||||
@@ -34,8 +36,10 @@ function restart_services() {
|
||||
}
|
||||
|
||||
/**
|
||||
* What to look at: { id (= the Health check id), src, name (chip), who (the log's subject), ok,
|
||||
* problem, back, detail?, repair: { what, run }? }. The log reads "<who> <problem> — <what>".
|
||||
* What to look at: { id (= the Health check id), src, name (chip, stored in English: view()
|
||||
* shows names() by id), who (the log's subject), ok,
|
||||
* problem, back, detail?, repair: { what, run }? }. The log reads "<who> <problem> - <what>"; its
|
||||
* words are L_(): English in the log, translated where it is shown.
|
||||
*/
|
||||
function probes(m) {
|
||||
let out = [];
|
||||
@@ -43,48 +47,48 @@ function probes(m) {
|
||||
push(out, ...awg.probes(m, { udp_listening: health.udp_listening, reapply: () => apply.apply(), owner: (ifn) => netifd.owner(ifn) }));
|
||||
if (length(m.servers))
|
||||
push(out, {
|
||||
id: 'nft', src: 'dawnline', name: 'Access rules', who: 'Access rules', ok: nft.present(),
|
||||
problem: 'are missing', back: 'are loaded again',
|
||||
repair: { what: 'loading them again', run: () => apply.apply() },
|
||||
id: 'nft', src: 'dawnline', name: 'Access rules', who: L_('Access rules'), ok: nft.present(),
|
||||
problem: L_('are missing'), back: L_('are loaded again'),
|
||||
repair: { what: L_('loading them again'), run: () => apply.apply() },
|
||||
});
|
||||
|
||||
if (length(filter(values(m.servers), (x) => x.private_key))) {
|
||||
let fw = apply.firewall_drift(m);
|
||||
push(out, {
|
||||
id: 'fw', src: 'dawnline', name: 'Firewall', who: 'Firewall', ok: fw == null,
|
||||
problem: fw == 'off' ? "isn't running on this router (fw4): tunnels and the portal are closed"
|
||||
: fw == 'changed' ? "rules for Dawnline were changed or removed" : "rules for Dawnline aren't loaded",
|
||||
back: 'rules for Dawnline are in place again',
|
||||
id: 'fw', src: 'dawnline', name: 'Firewall', who: L_('Firewall'), ok: fw == null,
|
||||
problem: fw == 'off' ? L_("isn't running on this router (fw4): tunnels and the portal are closed")
|
||||
: fw == 'changed' ? L_("rules for Dawnline were changed or removed") : L_("rules for Dawnline aren't loaded"),
|
||||
back: L_('rules for Dawnline are in place again'),
|
||||
// fw4 stopped on purpose is the admin's call: report it, do not start it.
|
||||
repair: fw == 'off' ? null : { what: 'restoring them', run: () => { apply.apply(); system('fw4 -q reload'); } },
|
||||
repair: fw == 'off' ? null : { what: L_('restoring them'), run: () => { apply.apply(); system('fw4 -q reload'); } },
|
||||
});
|
||||
}
|
||||
|
||||
let s = m.settings;
|
||||
if (s.portal_enabled && !length(health.needs().https) && !length(health.tcp_port_owners(s.portal_port)))
|
||||
push(out, {
|
||||
id: 'portal', src: 'portal', name: 'Portal', who: 'Personal portal', ok: health.tcp_listening(s.portal_port),
|
||||
problem: `isn't answering on port ${s.portal_port}`, back: 'answers again',
|
||||
id: 'portal', src: 'portal', name: 'Portal', who: L_('Personal portal'), ok: health.tcp_listening(s.portal_port),
|
||||
problem: sprintf(L_("isn't answering on port %d"), s.portal_port), back: L_('answers again'),
|
||||
detail: () => sh_out("logread -l 400 2>/dev/null | grep 'uhttpd' | grep -iE 'error|fail|cert|key|bind|address' | tail -n 4"),
|
||||
repair: { what: 'restarting it', run: restart_services },
|
||||
repair: { what: L_('restarting it'), run: restart_services },
|
||||
});
|
||||
|
||||
// Only while a server is on: with all of them off it idles on loopback.
|
||||
if (stat(loop.RESOLVER.conf) && length(filter(values(m.servers), (x) => x.enabled && x.private_key)))
|
||||
push(out, {
|
||||
id: 'resolver', src: 'dawnline', name: 'Resolver', who: 'DNS for Home-only devices', ok: loop.resolver_running(),
|
||||
problem: "isn't running", back: 'runs again',
|
||||
repair: { what: 'restarting it', run: restart_services },
|
||||
id: 'resolver', src: 'dawnline', name: 'Resolver', who: L_('DNS for Home-only devices'), ok: loop.resolver_running(),
|
||||
problem: L_("isn't running"), back: L_('runs again'),
|
||||
repair: { what: L_('restarting it'), run: restart_services },
|
||||
});
|
||||
|
||||
push(out, {
|
||||
id: 'rpc', src: 'dawnline', name: 'LuCI link', who: 'LuCI', ok: system('ubus list luci.dawnline >/dev/null 2>&1') == 0,
|
||||
problem: "can't reach Dawnline (luci.dawnline is missing in rpcd)", back: 'reaches Dawnline again',
|
||||
problem: L_("can't reach Dawnline (luci.dawnline is missing in rpcd)"), back: L_('reaches Dawnline again'),
|
||||
detail: () => sh_out('logread -l 400 2>/dev/null | grep rpcd | tail -n 4'),
|
||||
// A reload keeps LuCI logins; a restart (second try) signs everyone out —
|
||||
// and after three it stops: restarting rpcd every hour for good would
|
||||
// sign every admin out for good.
|
||||
repair: { what: 'reloading rpcd', max: 3, run: (n) => system(n > 1 ? '/etc/init.d/rpcd restart >/dev/null 2>&1' : '/etc/init.d/rpcd reload >/dev/null 2>&1') },
|
||||
repair: { what: L_('reloading rpcd'), max: 3, run: (n) => system(n > 1 ? '/etc/init.d/rpcd restart >/dev/null 2>&1' : '/etc/init.d/rpcd reload >/dev/null 2>&1') },
|
||||
});
|
||||
return out;
|
||||
}
|
||||
@@ -107,7 +111,8 @@ export function run(m) {
|
||||
x.ok = p.ok;
|
||||
if (p.ok) {
|
||||
if (x.reported)
|
||||
slog(p.src, 'up', p.back + (x.stuck ? ' · restored' : x.tries ? ` (after ${x.tries} repair${x.tries > 1 ? 's' : ''})` : ''), null, p.who);
|
||||
slog(p.src, 'up', x.stuck ? sprintf(L_('%s · restored'), p.back)
|
||||
: x.tries ? sprintf(x.tries > 1 ? L_('%s (after %d repairs)') : L_('%s (after %d repair)'), p.back, x.tries) : p.back, null, p.who);
|
||||
x.bad = 0;
|
||||
x.next = 0;
|
||||
x.reported = false;
|
||||
@@ -128,7 +133,7 @@ export function run(m) {
|
||||
if (busy)
|
||||
continue;
|
||||
if (p.repair?.max && x.tries >= p.repair.max && !x.reported) {
|
||||
slog(p.src, 'error', `${p.problem} — not repaired again (${p.repair.max} repairs didn't help)`, p.detail?.(), p.who);
|
||||
slog(p.src, 'error', sprintf(L_("%s - not repaired again (%d repairs didn't help)"), p.problem, p.repair.max), p.detail?.(), p.who);
|
||||
x.reported = true;
|
||||
continue;
|
||||
}
|
||||
@@ -142,7 +147,7 @@ export function run(m) {
|
||||
// trying quietly until it works again (that is logged).
|
||||
if (x.tries >= 3 && !x.stuck && now - (x.last ?? 0) >= 50) {
|
||||
x.stuck = true;
|
||||
slog(p.src, 'error', `${p.problem} — ${x.tries} repairs didn't help`, p.detail?.(), p.who);
|
||||
slog(p.src, 'error', sprintf(L_("%s - %d repairs didn't help"), p.problem, x.tries), p.detail?.(), p.who);
|
||||
}
|
||||
if (now < x.next)
|
||||
continue;
|
||||
@@ -151,13 +156,13 @@ export function run(m) {
|
||||
x.next = now + WAIT[min(x.tries, length(WAIT) - 1)];
|
||||
x.reported = true;
|
||||
if (!x.stuck)
|
||||
slog(p.src, 'repair', `${p.problem} — ${p.repair.what}`, p.detail?.(), p.who);
|
||||
slog(p.src, 'repair', sprintf(L_('%s - %s'), p.problem, p.repair.what), p.detail?.(), p.who);
|
||||
try {
|
||||
p.repair.run(x.tries);
|
||||
}
|
||||
catch (e) {
|
||||
if (!x.stuck)
|
||||
slog(p.src, 'error', `couldn't be repaired: ${e.message}`, null, p.who);
|
||||
slog(p.src, 'error', sprintf(L_("couldn't be repaired: %s"), e.message), null, p.who);
|
||||
}
|
||||
if (!x.stuck)
|
||||
push(repairs, { ts: now, id: p.id, name: p.name });
|
||||
@@ -168,18 +173,33 @@ export function run(m) {
|
||||
write_json(STATE, { last: now, targets: t, repairs }, 0o644);
|
||||
};
|
||||
|
||||
/** For the Health page: the watchdog's state and the newest log entries. */
|
||||
/**
|
||||
* The chip names of probes() by target id, in the language of the call. The
|
||||
* others (AmneziaWG's, "Home · AmneziaWG") are names only and stay as stored.
|
||||
*/
|
||||
function names() {
|
||||
return {
|
||||
agent: _('Agent'), nft: _('Access rules'), fw: _('Firewall'), portal: _('Portal'),
|
||||
resolver: _('Resolver'), rpc: _('LuCI link'),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* For the Health page: the watchdog's state and the newest log entries. Target
|
||||
* and repair names in the language of the call; the log as it was written.
|
||||
*/
|
||||
export function view(m) {
|
||||
let st = read_json(STATE, {});
|
||||
let beat = +(read_json(BEAT, 0) ?? 0);
|
||||
let n = names();
|
||||
// The agent itself: fine while it ticks (cron restarts it after 5 minutes without).
|
||||
let targets = [ { id: 'agent', name: 'Agent', ok: beat > 0 && time() - beat < 180, tries: 0 } ];
|
||||
let targets = [ { id: 'agent', name: n.agent, ok: beat > 0 && time() - beat < 180, tries: 0 } ];
|
||||
for (let id, x in (type(st.targets) == 'object' ? st.targets : {}))
|
||||
push(targets, { id, name: x.name, ok: !!x.ok, tries: x.tries ?? 0 });
|
||||
push(targets, { id, name: n[id] ?? x.name, ok: !!x.ok, tries: x.tries ?? 0 });
|
||||
return {
|
||||
watchdog: {
|
||||
enabled: m.settings.watchdog, last: st.last ?? null, beat: beat || null, now: time(),
|
||||
targets, repairs: st.repairs ?? [],
|
||||
targets, repairs: map(st.repairs ?? [], (r) => ({ ...r, name: n[r.id] ?? r.name })),
|
||||
},
|
||||
log: slog_read(200),
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user