=== modified file 'a/lib/Vulture/lib/Vulture/ResponseHandler.pm' --- a/lib/Vulture/lib/Vulture/ResponseHandler.pm +++ b/lib/Vulture/lib/Vulture/ResponseHandler.pm @@ -28,8 +28,8 @@ sub acl_ldap { my ($app, $dbh, $session) = @_; - my $query = "SELECT id_user FROM acl WHERE id_user='".$session->{user}."' AND id_app='".$app->{id}."' AND id_auth='".$app->{auth}."'"; -# $vulture_log->debug($query); + my $query = "SELECT id_user FROM acl WHERE id_user='".$session->{user}."' AND id_app='".$app->{id}."' AND id_auth='".$app->{id_method}."'"; + my $sth = $dbh->prepare($query); $sth->execute; if (($sth->fetchrow)) { @@ -107,12 +107,11 @@ sub auth_sql { my ($app, $dbh, $session) = @_; - my $query = "SELECT uri, db_user, db_pass, table_name, login_column, password_column, password_algo FROM sql WHERE id='".$app->{auth}."'"; + my $query = "SELECT uri, db_user, db_pass, table_name, login_column, password_column, password_algo FROM sql WHERE id='".$app->{id_method}."'"; my $sth = $dbh->prepare($query); $sth->execute(); my ($uri, $db_user, $db_pass, $table_name, $login_column, $password_column, $password_algo, $salt) = $sth->fetchrow; my $cnx = DBI->connect($uri, $db_user, $db_pass); - my $count; my $sql = "SELECT count(*) FROM ".$table_name." WHERE ".$login_column."='".$session->{user}."' AND ".$password_column."='"; if ($password_algo eq "plain") { @@ -167,7 +166,7 @@ sub auth_radius { my ($app, $dbh, $session) = @_; - my $query = "SELECT host, port, secret, timeout FROM radius WHERE id='1'"; + my $query = "SELECT host, port, secret, timeout FROM radius WHERE id='".$app->{id_method}."'"; my $sth = $dbh->prepare($query); $sth->execute(); my ($host, $port, $secret, $timeout) = $sth->fetchrow; === modified file 'a/rpm/INTRINsec-common/INTRINsec-common.spec' --- a/rpm/INTRINsec-common/INTRINsec-common.spec +++ b/rpm/INTRINsec-common/INTRINsec-common.spec @@ -83,7 +83,7 @@ make clean &&\ install -m 755 -d $RPM_BUILD_ROOT/opt/INTRINsec/etc/ &&\ install -m 644 %{SOURCE19} $RPM_BUILD_ROOT/opt/INTRINsec/etc/php.ini &&\ - cd ../modsecurity-apache-1.9.1/apache2 &&\ + cd ../modsecurity-apache-1.9.2/apache2 &&\ $RPM_BUILD_ROOT/opt/INTRINsec/httpd/bin/apxs -cia ./mod_security.c &&\ cd ../../mod_perl-2.0.2 &&\ perl -I ../ExtUtils-MakeMaker-6.26/lib Makefile.PL \ === modified file 'a/www/WEB-INF/classes/If.php' --- a/www/WEB-INF/classes/If.php +++ b/www/WEB-INF/classes/If.php @@ -361,6 +361,7 @@ if ($apps) { foreach ($apps as $app) { $servername = $app->getName(); + $intra = $app->getUrl(); if ($auth[$app->getAuth()]['ca']) { $ca_require = $auth[$app->getAuth()]['require']; @@ -460,7 +461,7 @@ $security_rules - ProxyPassReverse / $proto://$servername + ProxyPassReverse / $intra/ SetHandler perl-script @@ -518,6 +519,7 @@ ProxyRequests Off ProxyVia Off + ProxyPassReverse / $intra $security_rules === modified file 'a/www/WEB-INF/tpl/header.tpl' --- a/www/WEB-INF/tpl/header.tpl +++ b/www/WEB-INF/tpl/header.tpl @@ -25,7 +25,7 @@