Merge pull request #117 from Psiphon-Inc/next-release

Next release
Psiphon-Inc · Aug 23, 2022 · 9a5c95f · 9a5c95f
2 parents a0a54db + 36c3083
commit 9a5c95f
Show file tree

Hide file tree

Showing 13 changed files with 364 additions and 343 deletions.
diff --git a/src/3rdParty/psicash/Debug2015/psicash.lib b/src/3rdParty/psicash/Debug2015/psicash.lib
diff --git a/src/3rdParty/psicash/Debug2015/psicash.pdb b/src/3rdParty/psicash/Debug2015/psicash.pdb
diff --git a/src/3rdParty/psicash/Release2015/psicash.lib b/src/3rdParty/psicash/Release2015/psicash.lib
diff --git a/src/3rdParty/psicash/git.txt b/src/3rdParty/psicash/git.txt
@@ -1 +1 @@
-v2.3.1-0-ge96df62
+v2.4.0-0-ga62459e
diff --git a/src/3rdParty/psiphon-tunnel-core.exe b/src/3rdParty/psiphon-tunnel-core.exe
diff --git a/src/systemproxysettings.cpp b/src/systemproxysettings.cpp
@@ -30,9 +30,30 @@
 
 
 static const TCHAR* DEFAULT_CONNECTION_NAME = _T("");
-static const TCHAR* SYSTEM_PROXY_SETTINGS_PROXY_BYPASS = _T("<local>");
 static const int INTERNET_OPTIONS_NUMBER = 3;
 
+// According to Microsoft (https://docs.microsoft.com/en-us/troubleshoot/developer/browsers/connectivity-navigation/internet-explorer-uses-proxy-server-local-ip-address):
+//  > When you connect to a Web server using the Internet Protocol (IP) address or Fully
+//  > Qualified Domain Name (FQDN) on the local network, Microsoft Internet Explorer or
+//  > Windows Internet Explorer connects through an assigned proxy server even if the
+//  > Bypass proxy server for local addresses option is turned on.
+//  >
+//  > However, if you connect to a Web server using the host name (for example,
+//  > http://webserver) instead of the IP address (for example, http://10.0.0.1) or FQDN
+//  > (for example, http://webserver.domainname.com), the proxy server is bypassed and
+//  > Internet Explorer connects directly to the server.
+//
+// This means that it is insufficien to rely on "<local>" to bypass the proxy for local
+// addresses. We'll need to explicitly exclude private and link-local IP address ranges
+// (but using wildcards rather than CIDR).
+static const TCHAR* SYSTEM_PROXY_SETTINGS_PROXY_BYPASS = _T("<local>;"
+    /*10.0.0.0/8*/"10.*;"
+    /*172.16.0.0/12*/"172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;"
+    /*192.168.0.0/16*/"192.168.*;"
+    /*169.254.0.0/16 link-local*/"169.254.*;"
+    /*fc00::/7*/"[fc*];[fd*];"
+    /*fe80::/10 link-local*/"[fe8*];[fe9*];[fea*];[feb*]");
+
 bool GetCurrentSystemConnectionsProxyInfo(vector<ConnectionProxy>& o_proxyInfo);
 bool GetCurrentSystemConnectionProxy(tstring connectionName, ConnectionProxy& o_proxyInfo);
 bool SetCurrentSystemConnectionsProxy(const vector<ConnectionProxy>& connectionsProxies);
@@ -804,7 +825,7 @@ ProxyConfig ProxyConfig::DecomposeProxyInfo(const ConnectionProxy& proxyInfo)
         type = http | https | socks
 
     If no type is specific ("universal type"), it is the equivalent of "http=host;https=host".
-    Note that the "http" and "https" types specify traffic types for which the 
+    Note that the "http" and "https" types specify traffic types for which the
     proxy -- assumed to be an HTTP proxy -- should be used, whereas the "socks"
     type is a proxy type to be used with all traffic.
     */
@@ -816,7 +837,7 @@ ProxyConfig ProxyConfig::DecomposeProxyInfo(const ConnectionProxy& proxyInfo)
     }
 
     // To make parsing easier, convert the "universal type" to the multiple types format.
-    if (proxy_str.find('=') == tstring::npos) 
+    if (proxy_str.find('=') == tstring::npos)
     {
         tstringstream ss;
         ss << _T("http=") << proxy_str << _T(";https=") << proxy_str;

diff --git a/src/webui/_locales/be/messages.json b/src/webui/_locales/be/messages.json
@@ -248,7 +248,7 @@
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Sweden will be used."
     },
     "settings#egress-region#select-pl": {
-        "message": "Польшчы",
+        "message": "Польшча",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Sweden will be used."
     },
     "settings#egress-region#select-rs": {
@@ -260,59 +260,59 @@
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Australia will be used."
     },
     "settings#egress-region#select-ar": {
-        "message": "Argentina",
+        "message": "Аргенціна",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Argentina will be used."
     },
     "settings#egress-region#select-br": {
-        "message": "Brazil",
+        "message": "Бразілія",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Brazil will be used."
     },
     "settings#egress-region#select-cl": {
-        "message": "Chile",
+        "message": "Чылі",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Chile will be used."
     },
     "settings#egress-region#select-fi": {
-        "message": "Finland",
+        "message": "Фінляндыя",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Finland will be used."
     },
     "settings#egress-region#select-is": {
-        "message": "Iceland",
+        "message": "Ісландыя",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Iceland will be used."
     },
     "settings#egress-region#select-ie": {
-        "message": "Ireland",
+        "message": "Ірландыя",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ireland will be used."
     },
     "settings#egress-region#select-ke": {
-        "message": "Kenya",
+        "message": "Кенія",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Kenya will be used."
     },
     "settings#egress-region#select-mx": {
-        "message": "Mexico",
+        "message": "Мексіка",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Mexico will be used."
     },
     "settings#egress-region#select-za": {
-        "message": "South Africa",
+        "message": "Паўднёвая Афрыка",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in South Africa will be used."
     },
     "settings#egress-region#select-kr": {
-        "message": "Korea",
+        "message": "Карэя",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Korea will be used."
     },
     "settings#egress-region#select-tw": {
-        "message": "Taiwan",
+        "message": "Тайвань",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Taiwan will be used."
     },
     "settings#egress-region#select-ae": {
-        "message": "United Arab Emirates",
+        "message": "Аб'яднаныя Арабскія Эміраты",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in United Arab Emirates will be used."
     },
     "settings#egress-region#select-ee": {
-        "message": "Estonia",
+        "message": "Эстонія",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Estonia will be used."
     },
     "settings#egress-region#select-lv": {
-        "message": "Latvia",
+        "message": "Латвія",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
     },
     "settings#egress-region#description": {
@@ -724,19 +724,19 @@
         "description": "Label on a button. The text is followed by a value in PsiCash indicating how much it costs to buy an hour of Speed Boost. Clicking the button will buy Speed Boost. 'Speed Boost' is a reward that can be purchased with PsiCash credit. It provides unlimited network connection speed through Psiphon. Other words that can be used to help with translation are: 'turbo' (like cars), 'accelerate', 'warp speed', 'blast off', or anything that indicates a fast or unrestricted speed."
     },
     "psicash#1-hour": {
-        "message": "1 hour",
+        "message": "1 гадзіна",
         "description": "Label on a button. Clicking this button will buy 1 hour of Speed Boost."
     },
     "psicash#1-day": {
-        "message": "1 day",
+        "message": "1 дзень",
         "description": "Label on a button. Clicking this button will buy 1 day (24 hours) of Speed Boost."
     },
     "psicash#1-week": {
-        "message": "1 week",
+        "message": "1 тыдзень",
         "description": "Label on a button. Clicking this button will buy 1 week (7 days) of Speed Boost."
     },
     "psicash#1-month": {
-        "message": "1 month",
+        "message": "1 месяц",
         "description": "Label on a button. Clicking this button will buy 1 month (31 days) of Speed Boost."
     },
     "psicash#ui-buyingboost-buttontext": {
@@ -752,7 +752,7 @@
         "description": "Text before showing the user's PsiCash balance. So it will appear like: 'Balance: Ⓟ100'."
     },
     "psicash#pane-log-in": {
-        "message": "Log In!",
+        "message": "Увайсці!",
         "description": "Text on a button that will lead the user to log into their PsiCash account. This is an strong suggestion, hence the exclamation point -- use whatever makes sense in your language."
     },
     "psicash#pane-log-out": {
@@ -824,7 +824,7 @@
         "description": "Button in the modal dialog encouraging users to create an account when they attempt to buy PsiCash with real money without one. If they click this button, they will be taken to a screen where they can create an account or log into an existing one."
     },
     "psicash#modal-create-psicash-account-continue-button": {
-        "message": "Continue without account",
+        "message": "Працягнуць без уліковага запісу",
         "description": "Button in the modal dialog encouraging users to create an account when they attempt to buy PsiCash with real money without one. If they click this button, they will continue on to the PsiCash store."
     },
     "psicash#modal-psicash-logout-offline-header": {
@@ -836,15 +836,15 @@
         "description": "Body of a modal dialog that appears when the user tries to log out of thier PsiCash account while not currently connected to the Psiphon network. We don't allow PsiCash network requests when not connected, so only an inferior localy-only logout is available. 'Psiphon' must not be translated/transliterated. The word 'PsiCash' must not be translated or transliterated."
     },
     "psicash#modal-psicash-logout-offline-connect-button": {
-        "message": "Злучэнне",
+        "message": "Злучыцца",
         "description": "Button in the modal dialog shown to users when they attempt to log out of their PsiCash account with no active Psiphon tunnel. Clicking this button will abort the logout attempt and being connecting to a Psiphon server."
     },
     "psicash#modal-psicash-logout-offline-logout-anyway-button": {
         "message": "Log out anyway",
         "description": "Button in the modal dialog shown to users when they attempt to log out of their PsiCash account with no active Psiphon tunnel. Clicking this button will cause a local-only logout to be performed."
     },
     "psicash#modal-psicash-logout-offline-cancel-button": {
-        "message": "Адмяніць",
+        "message": "Скасаваць",
         "description": "Button in the modal dialog shown to users when they attempt to log out of their PsiCash account with no active Psiphon tunnel. Clicking this button will cancel the attempt."
     },
     "psicash#modal-login-header": {
@@ -872,7 +872,7 @@
         "description": "Text on the submit button in the PsiCash account login modal dialog."
     },
     "psicash#modal-login-cancel-button": {
-        "message": "Адмяніць",
+        "message": "Скасаваць",
         "description": "Text on the cancel button in the PsiCash account login modal dialog."
     },
     "psicash#alert#buyspeedboost-purchase-complete": {
@@ -976,7 +976,7 @@
         "description": "Body text of modal error message shown to user when Psiphon disallows some non-web internet traffic. The user needs to purchase Speed Boost in order to full app compatibilty and more speed. The words 'Psiphon' and 'PsiCash' must not be translated or transliterated. 'Speed Boost' is a reward that can be purchased with PsiCash credit. It provides unlimited network connection speed through Psiphon. Other words that can be used to help with translation are: 'turbo' (like cars), 'accelerate', 'warp speed', 'blast off', or anything that indicates a fast or unrestricted speed."
     },
     "appbackend#disallowed-traffic-notification-title": {
-        "message": "Apps not working?",
+        "message": "Праграмы не працуюць?",
         "description": "Appears in the notification area balloon when Psiphon disallows some non-web internet traffic. The user needs to purchase Speed Boost in order to full app compatibilty and more speed."
     },
     "appbackend#disallowed-traffic-notification-body": {

diff --git a/src/webui/_locales/fr/messages.json b/src/webui/_locales/fr/messages.json
@@ -940,7 +940,7 @@
         "description": "Body text of a modal dialog shown when a PsiCash login fails due to bad username or password."
     },
     "psicash#login#invalid-credentials-body-multiple-attempts": {
-        "message": "Would you instead like to <a class=\"js-psicash-account-signup\" href=\"#\">create an account</a> or <a class=\"js-psicash-forgot-account\" href=\"#\">recover your account</a>?",
+        "message": "Voulez-vous plutôt <a class=\"js-psicash-account-signup\" href=\"#\">créer un compte</a> ou <a class=\"js-psicash-forgot-account\" href=\"#\">récupérer votre compte</a> ?",
         "description": "Body text of a modal dialog shown when a PsiCash login fails due to bad username or password."
     },
     "psicash#login#server-error-body": {
@@ -1000,15 +1000,15 @@
         "description": "Sometimes when the Psiphon UI tries to open an external URL in the browser, it fails to open. This message indicates to the user that URL has been copied to the Windows system clipboard and is available for pasting into a browser. `<br>` may be used to split the message over two lines to ensure the alert doesn't take too much horizontal space."
     },
     "notice#psiphonui-fileerror-error-title": {
-        "message": "File Access Error",
+        "message": "Erreur d’accès au fichier",
         "description": "Title of modal error message shown to user when Psiphon cannot read/write/delete a file that it needs to access in order to function properly."
     },
     "notice#psiphonui-fileerror-error-body": {
-        "message": "<p>Psiphon cannot access a file it needs in order to work properly.</p>\n<p>Close the Psiphon application, delete the file listed below, and try running Psiphon again.</p>",
+        "message": "<p> Psiphon ne peut pas accéder aux fichiers dont il a besoin afin de fonctionner correctement.</p>\n<p>Fermez l’application Psiphon, supprimez le fichier indiqué ci-dessous et essayez de lancer Psiphon de nouveau.</p>",
         "description": "Body text of modal error message shown to user when Psiphon cannot read/write/delete a file that it needs to access in order to function properly. If this occurs, the user cannot connect and must take manual action to fix it. The word 'Psiphon' must not be translated or transliterated."
     },
     "notice#psiphonui-fileerror-detail-preamble": {
-        "message": "Filename and error message:",
+        "message": "Nom du fichier et message d’erreur :",
         "description": "Preamble text before technical details displayed in a modal error message shown to user when Psiphon cannot read/write/delete a file that it needs to access in order to function properly."
     },
     "banner#sponsored-by": {

diff --git a/src/webui/_locales/ru/messages.json b/src/webui/_locales/ru/messages.json
@@ -296,7 +296,7 @@
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in South Africa will be used."
     },
     "settings#egress-region#select-kr": {
-        "message": "Korea",
+        "message": "Корея",
         "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Korea will be used."
     },
     "settings#egress-region#select-tw": {