Author: rhafer Date: Fri Sep 5 14:25:44 2008 New Revision: 50740 URL: http://svn.opensuse.org/viewcvs/yast?rev=50740&view=rev Log: Move ACL generation code to libslapdconfig Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfigAgent.cc?rev=50740&r1=50739&r2=50740&view=diff ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Sep 5 14:25:44 2008 @@ -1198,62 +1198,58 @@ else if ( dbComponent == "acl" ) { YCPList argList = arg->asList(); - StringList aclStrings; + OlcAccessList aclList; for ( int j = 0; j < argList->size(); j++ ) { - std::ostringstream aclString; - aclString << "to"; + boost::shared_ptr<OlcAccess> acl( new OlcAccess() ); + // create the "to dn.<scope>=<dn> ...." part of the ACL YCPMap target = argList->value(j)->asMap()->value(YCPString("target"))->asMap(); if (target.size() == 0 ) { - aclString << " *"; + acl->setFilter(""); + acl->setAttributes(""); + acl->setDnType(""); + acl->setDn(""); + acl->setMatchAll(true); } else { + acl->setMatchAll(false); if (! target->value( YCPString("dn") ).isNull() ) { - aclString << " dn." - << target->value( YCPString("dn") )->asMap()->value( YCPString("style") )->asString()->value_cstr() - << "="; - - aclString << "\"" - << target->value( YCPString("dn") )->asMap()->value( YCPString("value") )->asString()->value_cstr() - << "\""; + acl->setDnType( target->value(YCPString("dn"))->asMap()->value(YCPString("style"))->asString()->value_cstr() ); + acl->setDn( target->value( YCPString("dn") )->asMap()->value( YCPString("value") )->asString()->value_cstr() ); } if (! target->value( YCPString("filter") ).isNull() ) { - aclString << " filter=\"" - << target->value( YCPString("filter") )->asString()->value_cstr() - << "\""; - + acl->setFilter( target->value( YCPString("filter") )->asString()->value_cstr() ); } if (! target->value( YCPString("attrs") ).isNull() ) { - aclString << " attrs=" - << target->value( YCPString("attrs") )->asString()->value_cstr(); + acl->setAttributes( target->value( YCPString("attrs") )->asString()->value_cstr() ); } } // now the " by <xyz> " part YCPList accessList = argList->value(j)->asMap()->value( YCPString("access") )->asList(); + OlcAclByList byList; for ( int k = 0; k < accessList->size(); k++ ) { - aclString << " by"; std::string type( accessList->value(k)->asMap()->value( YCPString("type") )->asString()->value_cstr() ); - aclString << " " << type; + std::string value; if ( type == "dn.subtree" || type == "dn.base" || type == "group" ) { - aclString << "=\"" - << accessList->value(k)->asMap()->value( YCPString("value") )->asString()->value_cstr() - << "\""; + value = accessList->value(k)->asMap()->value( YCPString("value") )->asString()->value_cstr(); } - aclString << " " << accessList->value(k)->asMap()->value( YCPString("level") )->asString()->value_cstr(); + std::string level( accessList->value(k)->asMap()->value( YCPString("level") )->asString()->value_cstr() ); + boost::shared_ptr<OlcAclBy> by( new OlcAclBy( level, type, value ) ); + byList.push_back( by ); } - y2milestone("Access String: %s", aclString.str().c_str() ); - aclStrings.add( aclString.str() ); + acl->setByList(byList); + aclList.push_back(acl); } - (*i)->replaceAccessControl(aclStrings); + (*i)->replaceAccessControl(aclList); ret = true; } else if ( dbComponent == "dbconfig" ) Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config.cpp?rev=50740&r1=50739&r2=50740&view=diff ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Sep 5 14:25:44 2008 @@ -658,6 +658,11 @@ } } +void OlcAccess::setByList( const OlcAclByList& byList ) +{ + m_byList = byList; +} + std::string OlcAccess::getFilter() const { return m_filter; @@ -688,6 +693,45 @@ return m_byList; } +std::string OlcAccess::toAclString() const +{ + std::ostringstream aclString; + + aclString << "to"; + if ( m_all ) + { + aclString << " *"; + } + else + { + if ( ! m_dn_value.empty() ) + { + aclString << " dn." << m_dn_type << "=\"" << m_dn_value << "\""; + } + if ( ! m_filter.empty() ) + { + aclString << " filter=" << m_filter; + } + if ( ! m_attributes.empty() ) + { + aclString << " attrs=" << m_attributes; + } + OlcAclByList::const_iterator i; + for ( i = m_byList.begin(); i != m_byList.end(); i++ ) + { + aclString << " by " << (*i)->getType(); + if ( (*i)->getType() == "dn.base" || + (*i)->getType() == "dn.subtree" || + (*i)->getType() == "group" ) + { + aclString << "=\"" << (*i)->getValue() << "\""; + } + aclString << " " << (*i)->getLevel(); + } + } + return aclString.str(); +} + OlcDatabase::OlcDatabase( const LDAPEntry& le=LDAPEntry()) : OlcConfigEntry(le) { @@ -757,7 +801,7 @@ { log_it(SLAPD_LOG_INFO, "acl VALUE: " + *i ); std::string aclString; - int index = splitIndexFromString( *i, aclString ); + splitIndexFromString( *i, aclString ); try { boost::shared_ptr<OlcAccess> acl( new OlcAccess(aclString) ); aclList.push_back(acl); @@ -785,17 +829,17 @@ this->addIndexedStringValue( "olcAccess", acl, index ); } -void OlcDatabase::replaceAccessControl(const StringList acllist ) +void OlcDatabase::replaceAccessControl(const OlcAccessList& acllist ) { // delete old Values first this->setStringValue( "olcAccess", "" ); - StringList::const_iterator i; + OlcAccessList::const_iterator i; int j = 0; for ( i = acllist.begin(); i != acllist.end(); i++ ) { - this->addAccessControl( *i, j ); + this->addAccessControl( (*i)->toAclString(), j ); j++; } } Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config.h?rev=50740&r1=50739&r2=50740&view=diff ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Fri Sep 5 14:25:44 2008 @@ -130,18 +130,34 @@ const std::string& value = "" ) : m_level(level), m_type(type), m_value(value) {}; - inline std::string getLevel() const { + inline std::string getLevel() const + { return m_level; } - inline std::string getType() const { + inline std::string getType() const + { return m_type; } - inline std::string getValue() const { + inline std::string getValue() const + { return m_value; } + inline void setLevel( const std::string &level ) + { + m_level = level; + } + inline void setType( const std::string &type ) + { + m_type = type; + } + inline void setValue( const std::string &value ) + { + m_value = value; + } + private: std::string m_level; std::string m_type; @@ -152,12 +168,15 @@ class OlcAccess { public: + inline OlcAccess() {} + OlcAccess( const std::string &aclString); void setFilter( const std::string& filter ); void setAttributes( const std::string& attrs ); void setDnType( const std::string& dnType ); void setDn( const std::string& dn ); void setMatchAll( bool matchAll ); + void setByList( const OlcAclByList &bylist); std::string getFilter() const; std::string getAttributes() const; @@ -166,6 +185,8 @@ bool matchesAll() const; OlcAclByList getAclByList() const; + std::string toAclString() const; + private: std::string m_filter; std::string m_attributes; @@ -197,7 +218,7 @@ bool getAcl( OlcAccessList& accessList ) const; virtual void addAccessControl( const std::string& acl, int index=-1 ); - virtual void replaceAccessControl( const StringList acllist ); + virtual void replaceAccessControl( const OlcAccessList& acllist ); void addOverlay(boost::shared_ptr<OlcOverlay> overlay); OlcOverlayList& getOverlays() ; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org