May 2021 - tor-commits - lists.torproject.org

[donate/master] Allow cryptocurrency thank you redirect to adopt localOptions
by peterh＠torproject.org 11 May '21

11 May '21

commit 3fd8b4c7f1956c520787f95d4a6d65e066dab3e2 Author: skirtiadi <skirtiadi(a)giantrabbit.com> Date: Wed Sep 30 11:49:09 2020 -0700 Allow cryptocurrency thank you redirect to adopt localOptions Part of porting the site to lektor site, cryptocurrency page is going to be on the lektor site. To allow flexibility of where people are going to be redirected after the submission, this code is put into place. key pair 'cryptocurrencyThankyouUrl' => '/cryptocurrency/thank-you' needs to be added in $localOptions in private/settings.local.php on the donate server for local settings. Issue #48280 --- src/CryptocurrencyController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CryptocurrencyController.php b/src/CryptocurrencyController.php index b49cd79c..65e4542a 100644 --- a/src/CryptocurrencyController.php +++ b/src/CryptocurrencyController.php @@ -86,7 +86,12 @@ class CryptocurrencyController extends BaseController { ); $crmController = new CrmController($this->container); $crmController->sendMessage('Tor\Donation\CryptoIntention', $donationInfo); - return $response->withRedirect('/cryptocurrency/thank-you'); + + $cryptocurrencyThankyouUrl = $this->container->get('settings')->get('cryptocurrencyThankyouUrl'); + if ($cryptocurrencyThankyouUrl === NULL) { + $cryptocurrencyThankyouUrl = '/cryptocurrency/thank-you'; + } + return $response->withRedirect($cryptocurrencyThankyouUrl); } public function generateTrxnId() {

1 0

[donate/master] Added Lektor error pages for Civi mailing links
by peterh＠torproject.org 11 May '21

11 May '21

commit b4056e56f8186dbefd57c1da41a19a48ddbb5326 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Mon Sep 28 16:33:52 2020 -0700 Added Lektor error pages for Civi mailing links If a user clicks on a link like an optout or unsubscribe link in a CiviCRM mailing and then there's some issue with the unsubscribe, we need to show them some errors, so we need to send them back to the lektor site because we aren't going to have any display pages on the donate site once the Lektor pages go live. Issue #48285 --- src/CivicrmMailingController.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/CivicrmMailingController.php b/src/CivicrmMailingController.php index 4d6a51c2..1f54a6ae 100644 --- a/src/CivicrmMailingController.php +++ b/src/CivicrmMailingController.php @@ -32,11 +32,18 @@ class CivicrmMailingController extends BaseController { $crmController->sendMessage('Tor\Mailing\SubscriptionChange', $messageInfo); $this->renderer->render($response, "{$method}.twig"); } else { - $this->vars = array( - 'errors' => $errors, - 'langcode' => $request->getAttribute('language') - ); - $this->renderer->render($response, 'error.twig', $this->vars); + $subscriptionErrorUrl = $this->container->get('settings')->get('civiMailingErrorUrl'); + if ($subscriptionErrorUrl === NULL) { + $this->vars = array( + 'errors' => $errors, + 'langcode' => $request->getAttribute('language') + ); + $this->renderer->render($response, 'error.twig', $this->vars); + } else { + $uri = Uri::createFromString($subscriptionErrorUrl); + $uri->addQueryParam('errors', json_encode($errors)); + return $response->withRedirect($uri->toString()); + } } } }

1 0

[donate/master] Changes to handle subscriptions from lektor
by peterh＠torproject.org 11 May '21

11 May '21

commit 1934fbdb02066f5729cf502d3f340a7efe3a1337 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Fri Sep 25 17:29:03 2020 -0700 Changes to handle subscriptions from lektor This lets Lektor handle the subscription forms and get back error messages and get redirected back to the correct pages. Issue #48283 --- src/SubscriptionController.php | 28 +++++++++++++++++++++------- src/settings.php | 11 ++++++++--- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/SubscriptionController.php b/src/SubscriptionController.php index c1ee6b66..7b8f7bc9 100644 --- a/src/SubscriptionController.php +++ b/src/SubscriptionController.php @@ -6,16 +6,17 @@ class SubscriptionController extends BaseController { const REDIS_PREFIX = "subscription_request:"; public $vars; public $redisClient = NULL; + public $settings; public function __construct($container) { parent::__construct($container); $this->vars = array(); + $this->settings = $this->container->get('settings'); } public function getRedisClient() { if ($this->redisClient == NULL) { - $settings = $this->container->get('settings'); - $this->redisClient = new \Predis\Client($settings['redis']); + $this->redisClient = new \Predis\Client($this->settings['redis']); } return $this->redisClient; } @@ -35,7 +36,7 @@ class SubscriptionController extends BaseController { $queryParams = $request->getQueryParams(); $token = ArrayExt::fetch($queryParams, 'token'); if ($token === NULL) { - $errors[] = "There should have been a query parameter called token in the URL we sent you, but that seems to be missing. If you cut and pasted the URL, double check that you got the entire streng."; + $errors[] = "There should have been a query parameter called token in the URL we sent you, but that seems to be missing. If you cut and pasted the URL, double check that you got the entire string."; } if (empty($errors)) { $redis = $this->getRedisClient(); @@ -54,10 +55,17 @@ class SubscriptionController extends BaseController { $crmController->sendMessage('Tor\Subscription\Subscribe', $subscriptionInfo); $counter = new SubscriptionCounter($this->container); $counter->countSubscriptionConfirmed(); - return $response->withRedirect("/subscribed"); + return $response->withRedirect($this->settings->get('subscriptionConfirmedUrl', '/subscribed')); } else { - $this->vars['errors'] = $errors; - return $this->renderer->render($response, 'subscribe.twig', $this->vars); + $subscriptionErrorUrl = $this->settings->get('subscriptionErrorUrl'); + if ($subscriptionErrorUrl === NULL) { + $this->vars['errors'] = $errors; + return $this->renderer->render($response, 'subscribe.twig', $this->vars); + } else { + $uri = Uri::createFromString($subscriptionErrorUrl); + $uri->addQueryParam('errors', json_encode($errors)); + return $response->withRedirect($uri->toString()); + } } } @@ -91,8 +99,14 @@ class SubscriptionController extends BaseController { $ipRateLimiter = $this->container->get('ipRateLimiter'); $ipRateLimiter->check($request); $this->sendSubscriptionConfirmation($request, $subscriptionInfo); - return $response->withRedirect("/subscription-request-sent"); + return $response->withRedirect($this->settings->get('subscriptionRequestSentUrl', '/subscription-request-sent')); } else { + if (ArrayExt::fetch($parsedBody, 'returnToReferrer')) { + $referer = reset($request->getHeader("HTTP_REFERER")); + $uri = Uri::createFromString($referer); + $uri->addQueryParam('errors', json_encode($errors)); + return $response->withRedirect($uri->toString()); + } $this->vars['errors'] = $errors; $this->vars['parsedBody'] = $parsedBody; return $this->renderer->render($response, 'subscribe.twig', $this->vars); diff --git a/src/settings.php b/src/settings.php index 0324bbae..3958ddea 100644 --- a/src/settings.php +++ b/src/settings.php @@ -3,8 +3,12 @@ define('PP_CONFIG_PATH', __DIR__ . '/../private'); require PP_CONFIG_PATH . '/settings.local.php'; -if (!isset($torSiteBaseUrl)) { - $torSiteBaseUrl = 'https://www.torproject.org/'; +if (!isset($localOptions)) { + $localOptions = []; +} + +if (!array_key_exists('torSiteBaseUrl', $localOptions)) { + $localOptions['torSiteBaseUrl'] = 'https://www.torproject.org/'; } $config = [ @@ -55,8 +59,9 @@ $config = [ 'sandbox' => 'AZc7yGlGGXnOjwt55x4wRGbWHo7Fdj83JAu0lqYruVWVoYa7JfQhy5F_ucy2mR6CjPmpmJwmtHONjTeB', 'production' => 'AbzwWJgUgwGMvTupfvigx1yAj75jNnCj4mFGC_VbiROUi2TfVwPS9IZ5MfqLsSUnXJFSMwaSaTR4FY_A' ], - 'torSiteBaseUrl' => $torSiteBaseUrl, ], ]; +$config['settings'] = array_merge($config['settings'], $localOptions); + return $config;

1 0

[donate/master] Fixed Uncaught Exception Error: "Class 'Tor\Uri' not found"
by peterh＠torproject.org 11 May '21

11 May '21

commit 945f003f2247a52a97268beda482e12aaab90c96 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Fri Oct 2 16:03:04 2020 -0700 Fixed Uncaught Exception Error: "Class 'Tor\Uri' not found" Forgot to checkin a file. --- src/Uri.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/Uri.php b/src/Uri.php new file mode 100644 index 00000000..f128184b --- /dev/null +++ b/src/Uri.php @@ -0,0 +1,24 @@ +<?php + +namespace Tor; + +class Uri extends \Slim\Http\Uri { + public $queryParams = []; + + public function addQueryParam($name, $value) { + $this->queryParams[$name] = $value; + } + + public static function buildQueryString($queryParams) { + return http_build_query($queryParams); + } + + public function __toString() { + $this->query = static::buildQueryString($this->queryParams); + return parent::__toString(); + } + + public function toString() { + return (string) $this; + } +}

1 0

[donate/master] Revert "Use wildcard for Access-Control-Allow-Origin"
by peterh＠torproject.org 11 May '21

11 May '21

commit 3df82c4eeb72db90348e40514b280d96accdc833 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Wed Oct 21 11:46:12 2020 -0700 Revert "Use wildcard for Access-Control-Allow-Origin" This reverts commit 9a7940ba9994789293b44c64632822cc849c918c. This didn't work because then we get this error in the browser: Access to fetch at 'https://donate-api.torproject.org/setExpressCheckout' from origin 'https://donate.torproject.org' has been blocked by CORS policy: Response to preflight request doesn't pass access control check: The value of the 'Access-Control-Allow-Origin' header in the response must not be the wildcard '*' when the request's credentials mode is 'include'. --- src/AccessControlMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AccessControlMiddleware.php b/src/AccessControlMiddleware.php index d5b7381d..d900fa63 100644 --- a/src/AccessControlMiddleware.php +++ b/src/AccessControlMiddleware.php @@ -4,7 +4,7 @@ namespace Tor; class AccessControlMiddleware { public function __invoke($request, $response, $next) { - $response = $response->withHeader('Access-Control-Allow-Origin', '*'); + $response = $response->withHeader('Access-Control-Allow-Origin', $this->torSiteBaseUrl); $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); $response = $response->withHeader('Access-Control-Allow-Headers', 'Content-Type'); return $next($request, $response);

1 0

[donate/master] Use subscriptionErrorUrl instead of referrer
by peterh＠torproject.org 11 May '21

11 May '21

commit 5cbae9a0e12c7d6e5b60b94f8f8db7a93a3a044e Author: Peter Haight <peterh(a)giantrabbit.com> Date: Wed Oct 21 10:22:35 2020 -0700 Use subscriptionErrorUrl instead of referrer Tor has Referrer-Policy: no-referrer on their live server, so we can't use the referrer for going back to the page that sent the request. --- src/SubscriptionController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/SubscriptionController.php b/src/SubscriptionController.php index aaa9504a..38027066 100644 --- a/src/SubscriptionController.php +++ b/src/SubscriptionController.php @@ -102,9 +102,8 @@ class SubscriptionController extends BaseController { return $response->withRedirect($this->settings->get('subscriptionRequestSentUrl', '/subscription-request-sent')); } else { if (ArrayExt::fetch($parsedBody, 'returnToReferrer')) { - $referers = $request->getHeader("HTTP_REFERER"); - $referer = reset($referers); - $uri = Uri::createFromString($referer); + $url = $this->settings->get('subscriptionErrorUrl'); + $uri = Uri::createFromString($url); $uri->addQueryParam('errors', json_encode($errors)); return $response->withRedirect($uri->toString()); }

1 0

[donate/master] Fixed notice with reset in subscription-request
by peterh＠torproject.org 11 May '21

11 May '21

commit 77d09d0e2563b4da637a25cf7f6e6be38ead5442 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Fri Oct 2 14:46:22 2020 -0700 Fixed notice with reset in subscription-request reset takes a reference, so we can't just pass the result of a function. Issue #48283 --- src/SubscriptionController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SubscriptionController.php b/src/SubscriptionController.php index 7b8f7bc9..aaa9504a 100644 --- a/src/SubscriptionController.php +++ b/src/SubscriptionController.php @@ -102,7 +102,8 @@ class SubscriptionController extends BaseController { return $response->withRedirect($this->settings->get('subscriptionRequestSentUrl', '/subscription-request-sent')); } else { if (ArrayExt::fetch($parsedBody, 'returnToReferrer')) { - $referer = reset($request->getHeader("HTTP_REFERER")); + $referers = $request->getHeader("HTTP_REFERER"); + $referer = reset($referers); $uri = Uri::createFromString($referer); $uri->addQueryParam('errors', json_encode($errors)); return $response->withRedirect($uri->toString());

1 0

[donate/master] Use wildcard for Access-Control-Allow-Origin
by peterh＠torproject.org 11 May '21

11 May '21

commit 9a7940ba9994789293b44c64632822cc849c918c Author: Peter Haight <peterh(a)giantrabbit.com> Date: Wed Oct 21 10:26:04 2020 -0700 Use wildcard for Access-Control-Allow-Origin The newsletter site captcha isn't working because it needs this header set to newsletter.torproject.org and this header doesn't allow multiple origins. We'll just set it to wildcard for now and figure out if we can do something else. --- src/AccessControlMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AccessControlMiddleware.php b/src/AccessControlMiddleware.php index d900fa63..d5b7381d 100644 --- a/src/AccessControlMiddleware.php +++ b/src/AccessControlMiddleware.php @@ -4,7 +4,7 @@ namespace Tor; class AccessControlMiddleware { public function __invoke($request, $response, $next) { - $response = $response->withHeader('Access-Control-Allow-Origin', $this->torSiteBaseUrl); + $response = $response->withHeader('Access-Control-Allow-Origin', '*'); $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); $response = $response->withHeader('Access-Control-Allow-Headers', 'Content-Type'); return $next($request, $response);

1 0

[donate/master] Limit matched amount in counter to first 100k donated
by peterh＠torproject.org 11 May '21

11 May '21

commit 908a52069b793e16ffc06f895f465aab104ccfff Author: Richard Esguerra <resguerra(a)giantrabbit.com> Date: Fri Dec 11 14:20:51 2020 -0800 Limit matched amount in counter to first 100k donated Contributions beyond $100k in the campaign period are not matched, so this limits the doubling logic to the appropriate amount and supplies the correct amount in the JSON used by the donate page counter. Issue #49798 --- src/CampaignController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CampaignController.php b/src/CampaignController.php index 1c795114..fd5715ca 100644 --- a/src/CampaignController.php +++ b/src/CampaignController.php @@ -18,7 +18,11 @@ class CampaignController extends BaseController { $value = $redis->get($keyName); $totals[$varName] = floatval($value); } - $totals['amountWithMozilla'] = $totals['totalAmount'] * 2; + if ($totals['totalAmount'] > 100000) { + $totals['amountWithMozilla'] = $totals['totalAmount'] + 100000; + } else { + $totals['amountWithMozilla'] = $totals['totalAmount'] * 2; + } return $totals; }

1 0

[donate/master] Set allowed origin header for onion hosts
by peterh＠torproject.org 11 May '21

11 May '21

commit 81529a62ee26f07c1fdd1e440bd95873ace6435e Author: Peter Haight <peterh(a)giantrabbit.com> Date: Wed Dec 23 14:13:24 2020 -0800 Set allowed origin header for onion hosts In order to let us use fetch with credentials (to send cookies), the allowed origin needs to match the URL for the site using fetch. So if the request is coming from an onion URL, then assume it's from the onion donate site. --- src/AccessControlMiddleware.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/AccessControlMiddleware.php b/src/AccessControlMiddleware.php index d900fa63..b8afeb15 100644 --- a/src/AccessControlMiddleware.php +++ b/src/AccessControlMiddleware.php @@ -3,8 +3,19 @@ namespace Tor; class AccessControlMiddleware { + const ONION_HOST_MAP = [ + 'rjrsgw3y2wzqmnvv.onion' => 'http://gsxohj375bk7gjal.onion', # prod + 'qbnprwaqyglijwqq.onion' => 'http://y7pm6of53hzeb7u2.onion', # stag + 'g2xie2z5bp5f6doi.onion' => 'http://y7pm6of53hzeb7u2.onion', # test + ]; + public function __invoke($request, $response, $next) { - $response = $response->withHeader('Access-Control-Allow-Origin', $this->torSiteBaseUrl); + $host = reset($request->getHeader('Host')); + $allowOriginUrl = $this->torSiteBaseUrl; + if (array_key_exists($host, static::ONION_HOST_MAP)) { + $allowOriginUrl = static::ONION_HOST_MAP[$host]; + } + $response = $response->withHeader('Access-Control-Allow-Origin', $allowOriginUrl); $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); $response = $response->withHeader('Access-Control-Allow-Headers', 'Content-Type'); return $next($request, $response);

1 0