diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-09-26 17:06:28 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-09-26 17:06:28 +0200 |
| commit | feeccb6a9e435932346d6a9ddeeb12c969362177 (patch) | |
| tree | a60fa68c9ca2ca8148de72764e2ac74d65a7cc72 /Bugzilla/Util.pm | |
| parent | 186374529e05a18e216ee96675d80488289c9c42 (diff) | |
| download | bugzilla-feeccb6a9e435932346d6a9ddeeb12c969362177.tar.gz bugzilla-feeccb6a9e435932346d6a9ddeeb12c969362177.tar.xz | |
Bug 917669 - invalid or expired authentication tokens and cookies should throw errors, not be silently ignored
r/a=glob
Diffstat (limited to 'Bugzilla/Util.pm')
| -rw-r--r-- | Bugzilla/Util.pm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index a3651182a..a9ff86c8b 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -14,8 +14,8 @@ use parent qw(Exporter); @Bugzilla::Util::EXPORT = qw(trick_taint detaint_natural detaint_signed html_quote url_quote xml_quote css_class_quote html_light_quote - i_am_cgi correct_urlbase remote_ip validate_ip - do_ssl_redirect_if_required use_attachbase + i_am_cgi i_am_webservice correct_urlbase remote_ip + validate_ip do_ssl_redirect_if_required use_attachbase diff_arrays on_main_db trim wrap_hard wrap_comment find_wrap_point format_time validate_date validate_time datetime_from @@ -237,6 +237,13 @@ sub i_am_cgi { return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0; } +sub i_am_webservice { + my $usage_mode = Bugzilla->usage_mode; + return $usage_mode == USAGE_MODE_XMLRPC + || $usage_mode == USAGE_MODE_JSON + || $usage_mode == USAGE_MODE_REST; +} + # This exists as a separate function from Bugzilla::CGI::redirect_to_https # because we don't want to create a CGI object during XML-RPC calls # (doing so can mess up XML-RPC). @@ -847,6 +854,7 @@ Bugzilla::Util - Generic utility functions for bugzilla # Functions that tell you about your environment my $is_cgi = i_am_cgi(); + my $is_webservice = i_am_webservice(); my $urlbase = correct_urlbase(); # Data manipulation @@ -974,6 +982,11 @@ Tells you whether or not you are being run as a CGI script in a web server. For example, it would return false if the caller is running in a command-line script. +=item C<i_am_webservice()> + +Tells you whether or not the current usage mode is WebServices related +such as JSONRPC, XMLRPC, or REST. + =item C<correct_urlbase()> Returns either the C<sslbase> or C<urlbase> parameter, depending on the |