X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fsoap.cgi;h=b4039214dd3bc33717a592d171c738275c845d30;hb=20eecdf58e4962a4d1a6042eacd0ed6abbd28e15;hp=b5766d7a52108e25c606f5f1885109daed217a38;hpb=098aa23e38ab42895ca19df25d7c88acd3744ff3;p=debbugs.git diff --git a/cgi/soap.cgi b/cgi/soap.cgi index b5766d7..b403921 100755 --- a/cgi/soap.cgi +++ b/cgi/soap.cgi @@ -1,4 +1,30 @@ -#!/usr/bin/perl -wT +#!/usr/bin/perl -T + +use warnings; +use strict; + +# if we're running out of git, we want to use the git base directory as the +# first INC directory. If you're not running out of git, don't do that. +use File::Basename qw(dirname); +use Cwd qw(abs_path); +our $debbugs_dir; +BEGIN { + $debbugs_dir = + abs_path(dirname(abs_path(__FILE__)) . '/../'); + # clear the taint; we'll assume that the absolute path to __FILE__ is the + # right path if there's a .git directory there + ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/; + if (defined $debbugs_dir and + -d $debbugs_dir . '/.git/') { + } else { + undef $debbugs_dir; + } + # if the first directory in @INC is not an absolute directory, assume that + # someone has overridden us via -I. + if ($INC[0] !~ /^\//) { + } +} +use if defined $debbugs_dir, lib => $debbugs_dir.'/lib/'; #use SOAP::Transport::HTTP; @@ -16,5 +42,29 @@ my $soap = Debbugs::SOAP::Server # soapy is stupid, and is using the 1999 schema; override it. *SOAP::XMLSchema1999::Serializer::as_base64Binary = \&SOAP::XMLSchema2001::Serializer::as_base64Binary; *SOAP::Serializer::as_anyURI = \&SOAP::XMLSchema2001::Serializer::as_string; -$soap-> handle; +# do this twice to avoid the warning if the serializer doesn't get +# used +*SOAP::XMLSchema1999::Serializer::as_base64Binary = \&SOAP::XMLSchema2001::Serializer::as_base64Binary; +*SOAP::Serializer::as_anyURI = \&SOAP::XMLSchema2001::Serializer::as_string; +# to work around the serializer improperly using date/time stuff +# (Nothing in Debbugs should be looked at as if it were date/time) we +# kill off all of the date/time related bits in the serializer. +my $typelookup = $soap->serializer()->{_typelookup}; +for my $key (keys %{$typelookup}) { + if (defined $key and + $key =~ /Month|Day|Year|date|time|duration/i + ) { + # set the sub to always return 0 + $typelookup->{$key}[1] = sub { 0 }; + } +} +our $warnings = ''; +eval { + # Ignore stupid warning because elements (hashes) can't start with + # numbers + local $SIG{__WARN__} = sub {$warnings .= $_[0] unless $_[0] =~ /Cannot encode unnamed element/}; + $soap->handle; +}; +die $@ if $@; +warn $warnings if length $warnings;