* [PATCH] www: unescape '+' in query parameter to space
@ 2016-06-26 3:56 5% Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2016-06-26 3:56 UTC (permalink / raw)
To: meta
Fixes: fbcb7de93884b ("www: remove a few more Plack::Request dependencies")
---
lib/PublicInbox/WWW.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index f1f4abd..d6b07bf 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -48,6 +48,7 @@ sub call {
my %qp = map {
my ($k, $v) = split('=', $_, 2);
$v = '' unless defined $v;
+ $v =~ tr/+/ /;
($k, $v)
} split(/[&;]/, uri_unescape($env->{QUERY_STRING}));
$ctx->{qp} = \%qp;
--
EW
^ permalink raw reply related [relevance 5%]
* [PATCH 3/3] www: remove a few more Plack::Request dependencies
2016-05-30 2:04 7% [PATCH 0/3] start removing Plack::Request from WWW Eric Wong
@ 2016-05-30 2:04 6% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2016-05-30 2:04 UTC (permalink / raw)
To: meta
Still a work in progress, but SearchView no longer depends
on Plack::Request at all and Feed is getting there.
We now parse all query parameters up front, but we may do
that lazily again in the future.
---
lib/PublicInbox/Feed.pm | 18 +++++++++---------
lib/PublicInbox/SearchView.pm | 14 +++++++-------
lib/PublicInbox/WWW.pm | 16 ++++++++++++----
3 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 81895db..07774cb 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -140,8 +140,8 @@ sub emit_html_index {
# if the 'r' query parameter is given, it is a legacy permalink
# which we must continue supporting:
- my $cgi = $ctx->{cgi};
- if ($cgi && !$cgi->param('r') && $srch) {
+ my $qp = $ctx->{qp};
+ if ($qp && !$qp->{r} && $srch) {
$state->{srch} = $srch;
$last = PublicInbox::View::emit_index_topics($state);
$param = 'o';
@@ -149,7 +149,7 @@ sub emit_html_index {
$last = emit_index_nosrch($ctx, $state);
$param = 'r';
}
- $footer = nav_footer($cgi, $last, $feed_opts, $state, $param);
+ $footer = nav_footer($ctx, $last, $feed_opts, $state, $param);
if ($footer) {
my $list_footer = $ctx->{footer};
$footer .= "\n\n" . $list_footer if $list_footer;
@@ -174,9 +174,9 @@ sub emit_index_nosrch {
}
sub nav_footer {
- my ($cgi, $last, $feed_opts, $state, $param) = @_;
- $cgi or return '';
- my $old_r = $cgi->param($param);
+ my ($ctx, $last, $feed_opts, $state, $param) = @_;
+ my $qp = $ctx->{qp} or return '';
+ my $old_r = $qp->{$param};
my $head = ' ';
my $next = ' ';
my $first = $state->{first};
@@ -186,7 +186,7 @@ sub nav_footer {
$next = qq!<a\nhref="?$param=$last"\nrel=next>next</a>!;
}
if ($old_r) {
- $head = $cgi->path_info;
+ $head = $ctx->{env}->{PATH_INFO};
$head = qq!<a\nhref="$head">head</a>!;
}
my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">Atom feed</a>";
@@ -200,11 +200,11 @@ sub each_recent_blob {
my $addmsg = qr!^:000000 100644 \S+ \S+ A\t(${hex}{2}/${hex}{38})$!;
my $delmsg = qr!^:100644 000000 \S+ \S+ D\t(${hex}{2}/${hex}{38})$!;
my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~\d+)?/;
- my $cgi = $ctx->{cgi};
+ my $qp = $ctx->{qp};
# revision ranges may be specified
my $range = 'HEAD';
- my $r = $cgi->param('r') if $cgi;
+ my $r = $qp->{r} if $qp;
if ($r && ($r =~ /\A(?:$refhex\.\.)?$refhex\z/o)) {
$range = $r;
}
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 0ae0505..2ec7ddf 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -16,7 +16,7 @@ our $LIM = 50;
sub sres_top_html {
my ($ctx) = @_;
- my $q = PublicInbox::SearchQuery->new($ctx->{cgi});
+ my $q = PublicInbox::SearchQuery->new($ctx->{qp});
my $code = 200;
# double the limit for expanded views:
@@ -260,13 +260,13 @@ use warnings;
use PublicInbox::Hval;
sub new {
- my ($class, $cgi) = @_;
- my $r = $cgi->param('r');
- my ($off) = (($cgi->param('o') || '0') =~ /(\d+)/);
+ my ($class, $qp) = @_;
+
+ my $r = $qp->{r};
bless {
- q => $cgi->param('q'),
- x => $cgi->param('x') || '',
- o => $off,
+ q => $qp->{'q'},
+ x => $qp->{x} || '',
+ o => (($qp->{o} || '0') =~ /(\d+)/),
r => (defined $r && $r ne '0'),
}, $class;
}
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index a820207..e211cd6 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -40,7 +40,15 @@ sub run {
sub call {
my ($self, $env) = @_;
my $cgi = Plack::Request->new($env);
- my $ctx = {cgi => $cgi, pi_config => $self->{pi_config}, www => $self};
+ my $ctx = { cgi => $cgi, env => $env, www => $self,
+ pi_config => $self->{pi_config} };
+
+ # we don't care about multi-value
+ my %qp = map {
+ (split('=', $_, 2))
+ } split(/[&;]/, uri_unescape($env->{QUERY_STRING}));
+ $ctx->{qp} = \%qp;
+
my $path_info = $env->{PATH_INFO};
my $method = $env->{REQUEST_METHOD};
@@ -180,7 +188,7 @@ sub get_index {
require PublicInbox::Feed;
my $srch = searcher($ctx);
footer($ctx);
- if (defined $ctx->{cgi}->param('q')) {
+ if ($ctx->{env}->{QUERY_STRING} =~ /(?:\A|[&;])q=/) {
require PublicInbox::SearchView;
PublicInbox::SearchView::sres_top_html($ctx);
} else {
@@ -262,7 +270,7 @@ sub footer {
my $cgi = $ctx->{cgi};
my $http = $cgi->base->as_string . $obj->{name};
$seen{$http} or unshift @urls, $http;
- my $ssoma_url = PublicInbox::Hval::prurl($cgi->{env}, SSOMA_URL);
+ my $ssoma_url = PublicInbox::Hval::prurl($ctx->{env}, SSOMA_URL);
if (scalar(@urls) == 1) {
$urls = "URL for <a\nhref=\"" . $ssoma_url .
qq(">ssoma</a> or <b>git clone --mirror $urls[0]</b>);
@@ -394,7 +402,7 @@ sub r301 {
$obj = $ctx->{-inbox};
}
my $url = $obj->base_url($cgi);
- my $qs = $cgi->env->{QUERY_STRING};
+ my $qs = $ctx->{env}->{QUERY_STRING};
$url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
$url .= $suffix if (defined $suffix);
$url .= "?$qs" if $qs ne '';
^ permalink raw reply related [relevance 6%]
* [PATCH 0/3] start removing Plack::Request from WWW
@ 2016-05-30 2:04 7% Eric Wong
2016-05-30 2:04 6% ` [PATCH 3/3] www: remove a few more Plack::Request dependencies Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2016-05-30 2:04 UTC (permalink / raw)
To: meta
It's unnecessary overhead and parsing request bodies for
forms should not be done for our application.
In other words, workarounds like commit 311c2adc8c63
("git-http-backend: avoid Plack::Request parsing body")
should not be necessary.
Eric Wong (3):
git-http-backend: remove dependency on Plack::Request
www: remove gratuitous use of Plack::Request methods
www: remove a few more Plack::Request dependencies
lib/PublicInbox/Feed.pm | 18 +++++++++---------
lib/PublicInbox/GitHTTPBackend.pm | 26 +++++++++++++-------------
lib/PublicInbox/SearchView.pm | 14 +++++++-------
lib/PublicInbox/WWW.pm | 28 ++++++++++++++++++----------
t/git-http-backend.psgi | 6 ++----
t/git-http-backend.t | 2 +-
6 files changed, 50 insertions(+), 44 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-30 2:04 7% [PATCH 0/3] start removing Plack::Request from WWW Eric Wong
2016-05-30 2:04 6% ` [PATCH 3/3] www: remove a few more Plack::Request dependencies Eric Wong
2016-06-26 3:56 5% [PATCH] www: unescape '+' in query parameter to space Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).