From b337af619b931a0b7ee25ad81b7cfb1c012da089 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 14 Sep 2019 17:36:17 +0000 Subject: [PATCH] Install an Unsafe Browser red theme compatible with Firefox 68 (refs: #17055) https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/Themes#Documentation says that "Lightweight themes have been deprecated", which explains why our old, custom lightweight theme is ignored. The only options to fix this are: - Create our own theme, get it automatically signed by Mozilla on AMO, download the resulting XPI, and somehow make it available at build time. - Use an existing theme with a GPL-3+ compliant license. I've chosen the latter option: this theme is almost identical to the one we had before. The XPI is 7.7K so I don't think it's worth devising a more complicated solution than just adding it to Git. --- .../lib/tails-shell-library/chroot-browser.sh | 9 +++++---- .../usr/local/sbin/unsafe-browser | 4 +++- .../unsafe-browser/extensions/red-2.0-an+fx.xpi | Bin 0 -> 7884 bytes .../chroot-browsers/unsafe-browser/prefs.js | 3 +++ .../chroot-browsers/unsafe-browser/theme.js | 2 -- wiki/src/doc/about/license.mdwn | 8 ++++++++ 6 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/extensions/red-2.0-an+fx.xpi delete mode 100644 config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh index 01e477dae7..8b31e7d60c 100644 --- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh +++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh @@ -122,7 +122,11 @@ configure_chroot_browser_profile () { local extension while [ -n "${*:-}" ]; do extension="${1}" ; shift - ln -s "${extension}" "${browser_ext}" + if [ "$(basename "${extension}")" = 'red-2.0-an+fx.xpi' ]; then + ln -s "${extension}" "${browser_ext}"/'{91a24c60-0f27-427c-b9a6-96b71f3984a9}.xpi' + else + ln -s "${extension}" "${browser_ext}" + fi done # Set preferences @@ -137,9 +141,6 @@ configure_chroot_browser_profile () { "${browser_prefs}" fi - # Set an appropriate theme - cat "${chroot_browser_config}/${browser_name}/theme.js" >> "${browser_prefs}" - # Customize the GUI. local browser_chrome="${browser_profile}/chrome/userChrome.css" mkdir -p "$(dirname "${browser_chrome}")" diff --git a/config/chroot_local-includes/usr/local/sbin/unsafe-browser b/config/chroot_local-includes/usr/local/sbin/unsafe-browser index bf0d711934..d84a80e84a 100755 --- a/config/chroot_local-includes/usr/local/sbin/unsafe-browser +++ b/config/chroot_local-includes/usr/local/sbin/unsafe-browser @@ -100,7 +100,9 @@ setup_chroot_for_browser "${CHROOT}" "${COW}" "${BROWSER_USER}" || \ echo "* Configuring chroot" configure_chroot_browser "${CHROOT}" "${BROWSER_USER}" "${BROWSER_NAME}" \ - "${HUMAN_READABLE_NAME}" "${HOME_PAGE}" "${TBB_EXT}"/langpack-*.xpi || \ + "${HUMAN_READABLE_NAME}" "${HOME_PAGE}" \ + "${TBB_EXT}"/langpack-*.xpi \ + /usr/share/tails/chroot-browsers/unsafe-browser/extensions/*.xpi || \ error "`gettext \"Failed to configure browser.\"`" # If /etc/resolv-over-clearnet.conf file is empty or doesn't exist, we # have no clearnet DNS server. diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/extensions/red-2.0-an+fx.xpi b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/extensions/red-2.0-an+fx.xpi new file mode 100644 index 0000000000000000000000000000000000000000..3c9bf73d61fb4b5c8d2d9d5718ef6806a20699a9 GIT binary patch literal 7884 zcmaKRWmH|swl(hV?(XjH4ncxLaCZwHEChEAPJlp=;2hlD-5n0@aBx2Qd+&Dl?f33m zHEN7qd)HcfN&Q%}rkWxo6c!lV`}n6IzrS!WakR0taC2v|b#ro*ik?E~WptjEEIja6a8wxwZ`L4hYJzm_k{Xj?^v9~hJP8dlZ+8n8;a@ze z7>0c&FR6v5fsOoS?9xJ0ii%=%SR^Bbc$5D*vChEzX2jn385=&V8fTZNwDc`WF%T9E z?CniW5f;wJCv4X1-Ji<$srDZ|MtJ{fZDC?=;mYFdXmx~i;Rf7G+&2C6Y4i5R8Q%2M z=6Y9Wr*m*fL{QL{Z+tx+BqXGnOMDCF&RCMbEfNxuzOW&YB*XUlI)}Nr8rmnda@IvP zr(wTq=i1SXmcwWyH0RB>6)Zg8AjquJO}=3wi&zfXjKa|m`*d!}@}&EcGF7#Nlsygf zE+I`hl>scrSs0mM;QtCi`CGL~)VqUE@0tG3A>h34P?pvdXO>ryVKsAdvtapG36f(~ zor2lG`p#dlR%4JxkeUtWt}TB?{7$)t>3c`NO#24_(6RI~ z&Yv^q@KVx$<<|Mgjg*P3eu-UXo7>^z#=;5rBB__Bd9_MI2C(fdm7J%9f>Tj>8ITW&U1vs%7fvkz}M z6Qk+kmB_YzYUw||f}-&ySpd|t<*5e64P2a-2B!TM(^BRzAyfr=bwkX6Ss4n~2yyjP z+Yygy`DXNdb-?rZZsXI++D6WK;KsG^#)H{7kiQD}^8e?=^$q*BwY36?x|k&97ql2y z3Hmt$D5BsVbOkmWvbaQcH2z4DVafO`EF>xPkKp)N-NX^yooj1w1Y(8|=InS3yxpQ~ z@s$n($jJL&r@dbdP`cnYsb{qCR?jsE%cAbi)G8-TibL~G_s>Tzf%mp8)e=1~8BD=A zlgUJ4pJpWh1|&K11F&!6{WBp=U@bB^VlY%<5XOPN3xk+%NI{!d9Uh`YlZH#Goc0#o zKQNIFMMMl#(oH6Z8Ib__?V-0~$8mN^L9-ug0ncnWGml;fNrX_L7s!F_`f>1 zY1_FMUQNAaNUZs`XU5Yt>_z@f?(Hvn(mhmHqbzIqO-45)hnf1mu8A=Fig(BGv0i70 zuguF=$!;>QiLU$nZwp8}WS3hMG&Zw1UzxS}kI?up`3mjyl113i*}TKv5J3TuT8)>j zH#0Kspt|30WyW}*8&_FmmFnV&bN2#2+c*ial+Nq^Ndu!_Mbs`GBT};x;`0J2%i=0F zon?v8C7@|aM?&|aOuF{QN-`A{L2TGUIfbv|m9+ErdW{XQi!(UZv3x=j&ByE@Hc zFu9)k9=8i)61dh29povF2Edea_k*tNCdhnEn%n{j?~b0zU5-Xw{yAat-6z0AqXORX zoLNL&SC&xLqmUwC(Y%1i#-1Ze2hdzCX@~$yWs~~K(MRixNqVq=Mj#twQ#VnBAlfhs zWJ(`g2&hY3@RsVs7HFg%>uXm`=5T7GOFSdGSnKdSXwe|X9^yvywBnUH==tutaw{UY zf<#0hzCw)7`clXHY_zuAS~F2Cy>?mBs!l-I=cIrEB67O7(GHHyr=u}aU0oDdv7O{d z?LTLhr*k&<1mI^>Sr6C=#7yjKFLVWA;?e}3A8dUTL4p`~fc2?`h6<^Un1i;t9rZ%)FL zG;81R39Ru(5g;}cc1;olJMV-9^O$=HH~>T>Q9V71ql!Rc6pNP!s!0snSG#WGLNs!h z(#DkuV6>(7f`+4kKUbsU7H-bdK~FWKm+i`!Wb-N_ibLaiHi=a@@!?#x^^Ml@qLt-& zLGiM*?wkE1(Dg+>>$IcPy`7j3(3*8!&i*Rj%JbO2$2FZKF={b!jT*ybn1q>xQ)<1S zoAM}oH#Sj%grz^IQqlLQu(`$h-s4=XvgG=fTTrd%N>$}Svx7i^aIA7YL6epV z-mCvdFwc(*bwHyxC-$kF0VU5q>)7F`PnmWod&aF_q+9i)h&rM$2ZvRPMUda{ppCtH zM!H;gZfeDvj^#v`!zDT4<%S|X#g>|s)$v6BJl$`v-aSSZNS|SgR5VK>R z8O$8w!xgI19fbI_amq7me1GSuJ)EtWG{hvHHv@<*Toweh_Pwu-MZ*eujxDoAE_uQH1YusjOWMKpln z!Gj(%QfrfnuDlr2!Xv>TapA8=gBS9IW z*pdmSZ*(+W;s++aJtjibXz_E8)k{fo0S-@T@>5vbMHx|A*}^nPC-HQq3Hx>#EMTY( zZ%BtUb^cxgAmudttb9nL2NSTw%1j>Ka>Egvr1xl{B>?%GYwRxYDDyLa{oL;8gPSLf zSF#UeFTI(8+sge_4C2+ef&I&rCh34&cu{Ac_$-A$;Qi5D+V4A(##@AZ-3!aDG!Q4} zgjZ>`rl1>xc_@eJIeSsx%wt5*J}vMdZM){GhxAKeAXsrRyh z8+5KmwTr@kx?GT6J;Ud>Qvamgu&~|7+>_m-*ypm{@{;W#{#ChH`sEsbxOt(aT=?2Z zgN1>6N>7-ZHhfQVy@r$*M-^~yh&O+<= z#E94~VxaGIKpxOjvkj6e5q;Dl+TABFgdtSD#L!B8PTaJ1J6~zu7t%9?7qOBtGcN0F z4x6vlX{;S|v%X3AsnKz&<2xK%M2s0+n>|e`)Z$TXkroqNXjJfWPe4oZmAu-zkNFmz zx`Ba7O7BxhMPuUOouhZ*oE9d7I3e#-}Sr+b9dvIt^3w;T8tj29i(U;zv zIzmoFURqlIH~IEw9;OTADNi2>N?+Pl-HadMW|MWUe#^*5_|6?B0E>3g9NmKrdubKBu17MS z#HRjTyLGp58yzsss636-*px19dLJ8!)P)@DVOpwZ=n3bICV>W429O?=NkJt?c&a<{akA4+T6!= z3KXjaZEa}+!lMsXxSr>T7JE$mj`(e8zecI#_&ir5vI%u6%Ik6X13U2|c9=)y@S+jd zI>nD=h62A~b!d}4ME5AF4L#6non7}oW8m<9(s?@KXvO&^bvD_Xz5OKnd)8b#e_3I9 z57Ehgg3eU=TZ^$j^RjcBMS91dD2M8@=Y!|_DgxsFsvG9N)y>Jr#@^n9#my37Txmj) ziJn9#1)SX2U zalF192{c|ltT1xJTqf5DZNtvN-7}kAMT&lw0L;!IF*h0MgMJ5Q{{=o0Zv2Bn-(8G=OlH%(`I4VD z2G(jR3i?wm?9J$-ef!y@YAk+5FfG-LMpyU6Qx~vNB1!O57nLtz>kjyY4t{9Rs7YZ8 z!~Ec$_yee}S~7mlzi|D0YtV7*_2y!{0DNuj0Nwg;EWA9lSMm<7LQ6ZJMsdbGbt00H z^DDh_#}9QtfP)d?ev|4<@suDh*o-B`APXPz#W$xg5T_ZXf<*u)LsRK0-*K=xS@ehp zu@ZMe0>SX5n~2G9A#4#P^T-uqs0 z;_!|35Q11T%B^#i*OpBwaim)piM&qFAgRm5XUT&ubEoE67biWsSk&DYOWgc74-G!7 zrsMCDXQY+wD_^e$Wv#acKSO9iYJv-2NMS?d$Z6$UCva=lanVU-g=ePH1eJTBm`j)k zyiS5;K@NvrxO`E9;|+xe=M$hD>ylK)xOfmxOE991RMOAHoE1|tixIYF?@9xYaAjcO zND`SNG39?NO2~@Vn(zxMgAL!~!DTkr$!AV~^ z!}~0s7gK2ztY-RWgXx$39J1vG%q@_)=alBfPN&B8DvU|SeLvkRO1oc*ww9hAghl5-!C`HJUEvpz6~e7Xd|6hw0Pn=bLqZUj3Hf=dhtdz}O39ak21XPc zDj_~}8eYSOu12RPCI?Eo$0aE;p67(lE!%DEK%i7*3aVTQHe~a?;G5}RgQW7Y#&G$p z91QzY#ZCJuRb8#^4dTXwN)Kmg=)qV{ju5Vl(sN14S z2OU|2lcyazIRmxa+}r|GJtDkrg_f;#cr8TzBQDZ@#-@&l#hK6PY`kwZFd6$1z7OALxHY zeocayXg<3VETCdbmwxI;U=>yhFw~jBp3@zj1$#^Qb}_)7(TE$D0KldYc1^A(rZWQ6 zRxK?(hnzt=3FI3>!)uRZtB@T}(pbW#z+}1k{P@l?sVl1~YFE|PX+S1gc7fE5d`m!h z%-otI#|vqWLkW$W!|#A$#unya>!)-Mz$@~@5&pc~UE-12Mm?tnQP23qO%J=0PFmP4 zV4soAv_kpkwM^xNLLnps3z%0r8(HX5*Q)7mt2m0S{o zmZuRuaQ5!${-D6Z#WjIwqHb2XPcwOIKc7i)K@QAfVz?Qu24;&R0Op*WzU6vVh!1cp zNL2O9q#_#DRR(ZI#UzRZnYSAH-3^fVCs0RST2!_LVYu9=(pEC-%|NLsDo&B=og&8E zGhNK=Eo@^jedNtd{`he#e4`#eg?S=snOp*OgnG!ZJ==f#Mq1=$^r`D>n!Fh-d!JPL z#cqh8jL!?SEC#$89GIf3_G-wzGO zc*$mRGR#s4j;-JgG{`;R=CgKl)>B|u6cybiGK)me>uVQ-W{pCpu_<;?7MrYI@B>jHJuEXiD9OyNqV1I!`U5;9b&^eD0dK^!dN#wQ2iJHa1e#)v;=)~)7 z9S5VBJISpKd#R(FsO=PcH}FsqRX-!^Yi-{)VC>n> z6asnYMm?99`n%;hKW&8t+XYX7l^Op{cciWhSa4??ccTK?xsx9<-x?<|%nH!?z`1MmEubz&VCo!B=$XZ|BNLijmLfrwa8kq8_FW zh1H=H%mg7`coV}ZxP~RC4D&kna_NT6U#r&FmMIa^0z-U@QOxU%KMxbAneXV8%n=ds zD0rU5 zWH|yv`ELhQR49-oR~pawa$YOssT%Dmi+_vq^oaoK>t8(JM`+6S#uGm4+8el+8~EA* zZGr8vOHn4Oird%9rT#c&5nZ!)t^3a&VOC=v3z8qnoqEGbzqMi13;3+6Q$8cMIr0_W zwN>v4_T7&UmH2jmhrv^QQ6j_HUHS@+00Wy3cCmN<1spAJQoGZBA<$~{j!pg~6u#>< zgDra73CVQ#OZ4|Ch`F)AMc6dush&Hnl(l$iT#b~fc_0T~W5Mf~|f$cTRRm%}bDpWnlG z7l|Q~5H^83`BWO)fw<3*Y=#x2MZYS~9BJlPN%SyRo`n}ZeViLwf92~xY34e-4oUi? z+5nNKl2k1`^n@R;8FF<=uOh8w{N`Ehz~jii-l%rDYbs}E)tM1|5e zs!4lhgp|RSC+fiG%FF%I3VMe_zN~4WOOKxm?OTba@|rCP3K z|HgCeG5J#M1I@MS{+7iV+RBGKZT8Hbj+pjuv2}vKT&VO+GY5hsCGO3Q?v%N1D&S7$ zAiZIDLFz}dhp0d@Q|`O|V#eZTd?`ylJ3hI~*MZ9mGSYPR{S-11#}v92Lee~jTGdu2 zj_8$duJjaBl)}#Bsn()RbMx-wP>2RV z+>NC>v+c0lOQeQ)DsVJvF#eaLr3rnRmdwgfO)dP{rQ|9uPk3$Nqpb zu7xSU7|$am!$@9PiGp+qo!nNmM4QlXzr=|1!Fs7ehlW3C3F}^1J01&m)ro>azP1%i z#xnGq&160+FtzdltU)Z|UIWm%(|R1`LhgQ~75k`;AAab|>+#D9Q?cd-!fTCfoQ@5I z;PzI3Y~P7F#tmed?kPsBV9`Y{9%OVCuw8A#2J&BEA53JJZ$+lABc)-`mjX#GkC=88 zrP#vYRDVe-LLF}Iri9=p{@7qyb;mz)7pCef^bt~G)uHJKo6r2Zyr0DFMzY#W*bw(<%Vn{&8k#uWunV@;vDl%8T6!M(1RJEBn#~J+cOPi(VHS): + - license: Creative Commons Attribution 3.0 + - author: [Firefox user 14030863](https://addons.mozilla.org/en-US/firefox/user/14030863/) + Website ======= -- GitLab