Explorar el Código

Don't automatically pgp encrypt email on onion only systems

Bob Mottram hace 7 años
padre
commit
3ebbfe0ebb
Se han modificado 1 ficheros con 12 adiciones y 0 borrados
  1. 12
    0
      src/freedombone-base-email

+ 12
- 0
src/freedombone-base-email Ver fichero

299
       echo "  route_data = \${perl{onionLookup}{$RISEUP_EMAIL_ONION}}"
299
       echo "  route_data = \${perl{onionLookup}{$RISEUP_EMAIL_ONION}}"
300
       echo "  no_more"; } > /etc/exim4/conf.d/router/905_exim4-config-riseup
300
       echo "  no_more"; } > /etc/exim4/conf.d/router/905_exim4-config-riseup
301
 
301
 
302
+    if ! grep -q "*.onion" /etc/exim4/conf.d/router/200_exim4-config_primary
303
+       sed -i 's|domains = ! +local_domains|domains = ! +local_domains : ! *.onion : ! riseup.net|g' /etc/exim4/conf.d/router/200_exim4-config_primary
304
+    fi
305
+
302
     { echo "onionrelays:";
306
     { echo "onionrelays:";
303
       echo "  driver    = manualroute";
307
       echo "  driver    = manualroute";
304
       echo "  domains   = *.onion";
308
       echo "  domains   = *.onion";
652
       echo '# Optional relay of SMTP via ISP';
656
       echo '# Optional relay of SMTP via ISP';
653
       echo '#set smtp_url="smtps://username:password@isp_mail_domain:465/"'; } > /etc/Muttrc
657
       echo '#set smtp_url="smtps://username:password@isp_mail_domain:465/"'; } > /etc/Muttrc
654
 
658
 
659
+    if [[ "$ONION_ONLY" != 'no' ]]; then
660
+        # On onion only systems email is onion router anyway, with its
661
+        # own encryption system, so we don't need the additional pgp layer
662
+        # except perhaps for some additional confidence
663
+        sed -i 's|set pgp_autoencrypt|unset pgp_autoencrypt|g' /etc/Muttrc
664
+        sed -i 's|set pgp_autosign|unset pgp_autosign|g' /etc/Muttrc
665
+    fi
666
+
655
     # For viewing long URLs
667
     # For viewing long URLs
656
     echo 'REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]' > "/home/$MY_USERNAME/.urlview"
668
     echo 'REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]' > "/home/$MY_USERNAME/.urlview"
657
     echo 'COMMAND lynx -dump -width=78 -nolist %s' >> "/home/$MY_USERNAME/.urlview"
669
     echo 'COMMAND lynx -dump -width=78 -nolist %s' >> "/home/$MY_USERNAME/.urlview"