Repair portal URL rewriting in buildPortalWSDL (Lemonldap-473)
This commit is contained in:
parent
2259b4bddd
commit
875b524fde
|
@ -2,23 +2,26 @@
|
||||||
|
|
||||||
use Lemonldap::NG::Portal::SharedConf;
|
use Lemonldap::NG::Portal::SharedConf;
|
||||||
|
|
||||||
my $portal = Lemonldap::NG::Portal::SharedConf->new( {} );
|
my $self = Lemonldap::NG::Portal::SharedConf->new( {} );
|
||||||
|
|
||||||
unless ( $portal->{Soap} ) {
|
unless ( $self->{Soap} ) {
|
||||||
print STDERR "Lemonldap::NG Portal SOAP capability is disabled.\n"
|
print STDERR "Lemonldap::NG Portal SOAP capability is disabled.\n"
|
||||||
. "Set 'Soap' option to 1 in manager or lemonldap-ng.ini to enable it.\n";
|
. "Set 'Soap' option to 1 in manager or lemonldap-ng.ini to enable it.\n";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
my @cookies = ( $portal->{cookieName} );
|
my $portal = $self->{portal};
|
||||||
push @cookies, "$portal->{cookieName}.http"
|
$portal .= "index.pl" if ( $portal =~ /\/$/ );
|
||||||
if ( $portal->{securedCookie} >= 2 );
|
|
||||||
|
my @cookies = ( $self->{cookieName} );
|
||||||
|
push @cookies, "$self->{cookieName}.http"
|
||||||
|
if ( $self->{securedCookie} >= 2 );
|
||||||
my $cookieList = join "\n",
|
my $cookieList = join "\n",
|
||||||
map { "<element name='$_' type='xsd:string'></element>" } @cookies;
|
map { "<element name='$_' type='xsd:string'></element>" } @cookies;
|
||||||
|
|
||||||
my $attrList = join "\n",
|
my $attrList = join "\n",
|
||||||
map { "<element name='$_' type='xsd:string' nillable='true'></element>" }
|
map { "<element name='$_' type='xsd:string' nillable='true'></element>" }
|
||||||
$portal->exportedAttr;
|
$self->attributeList;
|
||||||
|
|
||||||
print <<EOT;
|
print <<EOT;
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
@ -117,7 +120,7 @@ $attrList
|
||||||
|
|
||||||
<wsdl:service name="authenticationService">
|
<wsdl:service name="authenticationService">
|
||||||
<wsdl:port binding="impl:authenticationBinding" name="authenticationPort">
|
<wsdl:port binding="impl:authenticationBinding" name="authenticationPort">
|
||||||
<wsdlsoap:address location="$portal->{portal}" />
|
<wsdlsoap:address location="$portal" />
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
|
|
||||||
|
@ -152,7 +155,7 @@ $attrList
|
||||||
|
|
||||||
<wsdl:service name="notificationService">
|
<wsdl:service name="notificationService">
|
||||||
<wsdl:port binding="impl:notificationBinding" name="notificationPort">
|
<wsdl:port binding="impl:notificationBinding" name="notificationPort">
|
||||||
<wsdlsoap:address location="$portal->{portal}/notification" />
|
<wsdlsoap:address location="$portal/notification" />
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
|
|
||||||
|
@ -229,7 +232,7 @@ $attrList
|
||||||
|
|
||||||
<wsdl:service name="sessionsService">
|
<wsdl:service name="sessionsService">
|
||||||
<wsdl:port binding="impl:sessionsBinding" name="sessionsPort">
|
<wsdl:port binding="impl:sessionsBinding" name="sessionsPort">
|
||||||
<wsdlsoap:address location="$portal->{portal}/sessions" />
|
<wsdlsoap:address location="$portal/sessions" />
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user