Add PKP (and, thus, SOCKS proxy) support

2 files changed, 20 insertions, 1 deletions

diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index 8a21ffa..1c54aec 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -1079,6 +1079,17 @@ sub backend_form {
 			{
 				$type = undef;
 			}
+
+			# PKP is behind a GeoIP filter. Only list it if travelynx.conf
+			# indicates that our IP is allowed or provides a proxy.
+			elsif (
+				$backend->{name} eq 'PKP'
+				and not( $self->app->config->{hafas}{PKP}{geoip_ok}
+					or $self->app->config->{hafas}{PKP}{proxy} )
+			  )
+			{
+				$type = undef;
+			}
 			elsif ( my $s = $self->hafas->get_service( $backend->{name} ) ) {
 				$type                = 'HAFAS';
 				$backend->{longname} = $s->{name};
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index a0ae43b..dd16c45 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -10,6 +10,7 @@ use DateTime::Format::Strptime;
 use List::Util      qw(uniq min max);
 use List::UtilsBy   qw(max_by uniq_by);
 use List::MoreUtils qw(first_index);
+use Mojo::UserAgent;
 use Mojo::Promise;
 use Text::CSV;
 use Travel::Status::DE::IRIS::Stations;
@@ -529,9 +530,16 @@ sub geolocation {
 	if ($hafas_service) {
 		$self->render_later;
 
+		my $agent = $self->ua;
+		if ( my $proxy = $self->app->config->{hafas}{$hafas_service}{proxy} ) {
+			$agent = Mojo::UserAgent->new;
+			$agent->proxy->http($proxy);
+			$agent->proxy->https($proxy);
+		}
+
 		Travel::Status::DE::HAFAS->new_p(
 			promise    => 'Mojo::Promise',
-			user_agent => $self->ua,
+			user_agent => $agent,
 			service    => $hafas_service,
 			geoSearch  => {
 				lat => $lat,