X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=33a94fa5e8832fee63cbf23b44369226463ce516;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=4a2a1052f444e0660ef5afcaa801fd66d915211a;hpb=69c50fae6d6f6eea04890d1433cb3503544763a0;p=metaproxy-moved-to-github.git

diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp
index 4a2a105..33a94fa 100644
--- a/src/filter_auth_simple.cpp
+++ b/src/filter_auth_simple.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_auth_simple.cpp,v 1.15 2006-01-18 14:38:48 mike Exp $
+/* $Id: filter_auth_simple.cpp,v 1.17 2006-01-18 15:07:09 mike Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -38,10 +38,10 @@ namespace yp2 {
             std::map<std::string, PasswordAndDBs> userRegister;
             std::map<std::string, std::list<std::string> > targetsByUser;
             std::map<yp2::Session, std::string> userBySession;
-            bool discardUnauthorisedDBs;
+            bool discardUnauthorisedTargets;
             Rep() { got_userRegister = false;
                     got_targetRegister = false;
-                    discardUnauthorisedDBs = false; }
+                    discardUnauthorisedTargets = false; }
         };
     }
 }
@@ -75,8 +75,8 @@ void yp2::filter::AuthSimple::configure(const xmlNode * ptr)
             targetRegisterName = yp2::xml::get_text(ptr);
             m_p->got_targetRegister = true;
         } else if (!strcmp((const char *) ptr->name,
-                           "discardUnauthorisedDBs")) {
-            m_p->discardUnauthorisedDBs = true;
+                           "discardUnauthorisedTargets")) {
+            m_p->discardUnauthorisedTargets = true;
         } else {
             die("Bad element in auth_simple: <"
                 + std::string((const char *) ptr->name) + ">");
@@ -341,47 +341,30 @@ void yf::AuthSimple::check_targets(yp2::Package & package) const
 
     std::list<std::string> targets;
     Z_OtherInformation *otherInfo = initReq->otherInfo;
-    yp2::util::get_vhost_otherinfo(&otherInfo, 0, targets);
+    yp2::util::get_vhost_otherinfo(&otherInfo, 1, targets);
 
     // Check each of the targets specified in the otherInfo package
     std::list<std::string>::iterator i;
 
-    printf("pre: got %d targets\n", targets.size());
     i = targets.begin();
     while (i != targets.end()) {
-        printf("pre: considering target '%s'\n", (*i).c_str());
-        i++;
-    }
-
-    i = targets.begin();
-    while (i != targets.end()) {
-        printf("checking target '%s'\n", (*i).c_str());
         if (contains(authorisedTargets, *i) ||
             contains(authorisedTargets, "*")) {
-            printf("target '%s' is ok\n", (*i).c_str());
             i++;
         } else {
-            printf("target '%s' sucks\n", (*i).c_str());
-            if (!m_p->discardUnauthorisedDBs)
+            if (!m_p->discardUnauthorisedTargets)
                 return reject_init(package,
                     YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, i->c_str());
             i = targets.erase(i);
         }
     }
 
-    printf("post: got %d targets\n", targets.size());
-    i = targets.begin();
-    while (i != targets.end()) {
-        printf("post: considering target '%s'\n", (*i).c_str());
-        i++;
-    }
-
     if (targets.size() == 0)
         return reject_init(package,
                            YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED,
+                           // ### It would be better to use the Z-db name
                            "all databases");
 
-    // ### This is a no-op if the list has not changed
     yp2::odr odr;
     yp2::util::set_vhost_otherinfo(&otherInfo, odr, targets);
     package.move();