June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48620 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:44 2008 New Revision: 48620 URL: http://svn.opensuse.org/viewcvs/yast?rev=48620&view=rev Log: - blacklist already indexed Attributs in AddIndexPopup() - return new IndexMap from AddIndexPopup() Modified: trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:44 2008 @@ -1013,9 +1013,21 @@ define boolean cb_input_bdb_index() { y2milestone("cb_input_bdb_index, handlercmd: %1", handler_cmd); + integer index = (integer) widget_map[current_tree_item, "index"]:nil; if ( handler_cmd == `pb_idx_add ) { - AddIndexPopup(); + map<string, map<string, boolean> > idxMap = LdapServer::GetDatabaseIndexes( index ); + list<string> skip = []; // skip attribute that already have an index defined + foreach( string attr, map<string, boolean> idx, idxMap, + { + skip = add( skip, attr ); + } + ); + map<string,any> newIdx = AddIndexPopup(skip); + if ( size(newIdx) > 0 ) + { + } + } return true; } Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:58:44 2008 @@ -390,8 +390,9 @@ ) ); - define boolean AddIndexPopup() + define map<string,any> AddIndexPopup( list<string> skipAttrs ) { + y2milestone("AddIndexPopup skipAttrs: %1", skipAttrs ); term content = `VBox( `Heading( _("Add Index") ), @@ -414,7 +415,9 @@ (map<string, map <string,boolean> >) SCR::Read( .ldapserver.schema.attributeTypes ); list<string> items = []; foreach(string key, map<string,boolean> idx, attrTypes, { - items = add( items, key ); + if ( nil == find( string elem, skipAttrs, ``( tolower(elem) == tolower(key) ) ) ) { + items = add( items, key ); + } } ); items = lsort(items); UI::OpenDialog( `opt(`decorated), content ); @@ -443,14 +446,19 @@ UI::ChangeWidget( `cb_idx_pres, `Enabled, false ); } + map<string,any> retval = $[]; while (true) { any ret = UI::UserInput(); y2milestone("ret = %1", ret ); + if (ret == `pb_cancel ) + { + break; + } + selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); + y2milestone("selected Attribute \"%1\"", selectedAttr ); if ( ret == `cb_attrs ) // Attribute selected in the Combobox { - selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); - y2milestone("selected Attribute \"%1\"", selectedAttr ); map <string, boolean> idxOpt = attrTypes[selectedAttr]:nil ; y2milestone("index opts: %1", idxOpt ); if ( idxOpt["equality"]:false ) @@ -471,15 +479,17 @@ } else { UI::ChangeWidget( `cb_idx_pres, `Enabled, false ); } - } else if (ret == `pb_cancel ) - { - break; } else if (ret == `pb_ok ) { + retval["name"] = selectedAttr; + retval["pres"] = UI::QueryWidget( `cb_idx_pres, `Value ); + retval["eq"] = UI::QueryWidget( `cb_idx_eq, `Value ); + retval["substr"] = UI::QueryWidget( `cb_idx_substr, `Value ); + y2milestone("new index: %1", newidx ); break; } } UI::CloseDialog(); - return true; + return retval; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48619 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:40 2008 New Revision: 48619 URL: http://svn.opensuse.org/viewcvs/yast?rev=48619&view=rev Log: - read available attribute types from schema config - figure out allowed indexes from schema config Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:40 2008 @@ -401,11 +401,6 @@ return YCPNull(); } -bool comparesAttrTypes( const LDAPAttrType& a1, const LDAPAttrType& a2 ) -{ - return ( a1.getName() < a2.getName() ); -} - YCPValue SlapdConfigAgent::ReadSchema( const YCPPath &path, const YCPValue &arg, const YCPValue &opt) @@ -422,38 +417,50 @@ schema = olc.getSchemaNames(); } OlcSchemaList::const_iterator i; - YCPList resList; + YCPMap resMap; for (i = schema.begin(); i != schema.end(); i++ ) { y2milestone("Schema: %s", (*i)->getName().c_str() ); std::vector<LDAPAttrType> types = (*i)->getAttributeTypes(); - std::sort( types.begin(), types.end(), comparesAttrTypes ); std::vector<LDAPAttrType>::const_iterator j; for ( j = types.begin(); j != types.end(); j++ ) { YCPMap attrMap; - attrMap.add( YCPString("name"), YCPString( j->getName() ) ); - if ( j->getEqualityOid() != "" ) - { - attrMap.add( YCPString("equality"), YCPBoolean( true ) ); - } else { - attrMap.add( YCPString("equality"), YCPBoolean( false ) ); - } - if ( j->getSubstringOid() != "" ) - { - attrMap.add( YCPString("substring"), YCPBoolean( true ) ); + + // Handling derived AttributeTypes. + // Attention! This code assumes that supertypes have been + // read prior to their subtypes + if ( j->getSuperiorOid() != "" ){ + y2milestone("'%s' is a subtype of '%s'",j->getName().c_str(), j->getSuperiorOid().c_str() ); + // locate Supertype + + YCPMap supMap = resMap->value(YCPString(j->getSuperiorOid()))->asMap(); + attrMap.add( YCPString("equality"), supMap->value(YCPString("equality")) ); + attrMap.add( YCPString("substring"), supMap->value(YCPString("substring")) ); + attrMap.add( YCPString("presence"), supMap->value(YCPString("presence")) ); } else { - attrMap.add( YCPString("substring"), YCPBoolean( false ) ); + if ( j->getEqualityOid() != "" ) + { + attrMap.add( YCPString("equality"), YCPBoolean( true ) ); + } else { + attrMap.add( YCPString("equality"), YCPBoolean( false ) ); + } + if ( j->getSubstringOid() != "" ) + { + attrMap.add( YCPString("substring"), YCPBoolean( true ) ); + } else { + attrMap.add( YCPString("substring"), YCPBoolean( false ) ); + } + attrMap.add( YCPString("presence"), YCPBoolean( true ) ); } - attrMap.add( YCPString("presence"), YCPBoolean( true ) ); // FIXME: how should "approx" indexing be handled, create // whitelist based upon syntaxes? - resList.add( attrMap ); + resMap.add( YCPString( j->getName() ), attrMap ); } } - return resList; + return resMap; } return YCPNull(); } Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:58:40 2008 @@ -395,28 +395,86 @@ term content = `VBox( `Heading( _("Add Index") ), - `ComboBox( `id( `cb_attrs ), `opt( `hstretch ), "Attributetypes" ), + `ComboBox( `id( `cb_attrs ), `opt( `hstretch, `notify ), "Attributetypes" ), + `Left( + `CheckBox( `id( `cb_idx_pres ), _("Presence") ) + ), + `Left( + `CheckBox( `id( `cb_idx_eq ), _("Equality") ) + ), + `Left( + `CheckBox( `id( `cb_idx_substr ), _("Substring") ) + ), `HBox( `PushButton( `id( `pb_ok ), Label::OKButton() ), `PushButton( `id( `pb_cancel ), Label::CancelButton() ) ) ); - list<map<string,any> > attrTypes = (list<map <string,any> >) SCR::Read( .ldapserver.schema.attributeTypes ); + map <string, map<string,boolean> > attrTypes = + (map<string, map <string,boolean> >) SCR::Read( .ldapserver.schema.attributeTypes ); list<string> items = []; - foreach( map<string,any> attr, attrTypes, { - items = add( items, (string)attr["name"]:"" ); - y2milestone( "%1 (eq:%2)", (string)attr["name"]:"", (boolean)attr["equality"]:false ); + foreach(string key, map<string,boolean> idx, attrTypes, { + items = add( items, key ); } ); + items = lsort(items); UI::OpenDialog( `opt(`decorated), content ); UI::ChangeWidget( `cb_attrs, `Items, items ); + + string selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); + y2milestone("selected Attribute \"%1\"", selectedAttr ); + map <string, boolean> idxOpt = attrTypes[selectedAttr]:nil ; + y2milestone("index opts: %1", idxOpt ); + if ( idxOpt["equality"]:false ) + { + UI::ChangeWidget( `cb_idx_eq, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_idx_eq, `Enabled, false ); + } + if ( idxOpt["substring"]:false ) + { + UI::ChangeWidget( `cb_idx_substr, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_idx_substr, `Enabled, false ); + } + if ( idxOpt["presence"]:false ) + { + UI::ChangeWidget( `cb_idx_pres, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_idx_pres, `Enabled, false ); + } + while (true) { any ret = UI::UserInput(); - if (ret == `pb_cancel ) + y2milestone("ret = %1", ret ); + if ( ret == `cb_attrs ) // Attribute selected in the Combobox + { + selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); + y2milestone("selected Attribute \"%1\"", selectedAttr ); + map <string, boolean> idxOpt = attrTypes[selectedAttr]:nil ; + y2milestone("index opts: %1", idxOpt ); + if ( idxOpt["equality"]:false ) + { + UI::ChangeWidget( `cb_idx_eq, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_idx_eq, `Enabled, false ); + } + if ( idxOpt["substring"]:false ) + { + UI::ChangeWidget( `cb_idx_substr, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_idx_substr, `Enabled, false ); + } + if ( idxOpt["presence"]:false ) + { + UI::ChangeWidget( `cb_idx_pres, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_idx_pres, `Enabled, false ); + } + } else if (ret == `pb_cancel ) { break; - } - if (ret == `pb_ok ) + } else if (ret == `pb_ok ) { break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48618 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc agent/SlapdConfigAgent.h lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:36 2008 New Revision: 48618 URL: http://svn.opensuse.org/viewcvs/yast?rev=48618&view=rev Log: initial work on index support Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/agent/SlapdConfigAgent.h trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:58:36 2008 @@ -556,6 +556,16 @@ return $rc; } +BEGIN { $TYPEINFO {GetDatabaseIndexes} = ["function", [ "map" , "string", [ "map", "string", "boolean" ] ], "integer" ]; } +sub GetDatabaseIndexes +{ + my ($self, $index) = @_; + y2milestone("GetDatabase ".$index); + my $rc = SCR->Read(".ldapserver.database.{".$index."}.indexes" ); + y2milestone( "Indexes: ".Data::Dumper->Dump([$rc]) ); + return $rc; +} + BEGIN { $TYPEINFO {GetSchemaList} = ["function", [ "list" , "string"] ]; } sub GetSchemaList { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:36 2008 @@ -74,9 +74,13 @@ } else if ( path->component_str(0) == "schemaList" ) { - y2milestone("read databases"); + y2milestone("read schemalist"); return ReadSchemaList(path->at(1), arg, opt); } + else if ( path->component_str(0) == "schema" ) + { + return ReadSchema( path->at(1), arg, opt ); + } else if ( path->component_str(0) == "database" ) { y2milestone("read database"); @@ -340,6 +344,7 @@ y2milestone("Path %s Length %ld ", path->toString().c_str(), path->length()); std::string dbIndexStr = path->component_str(0); + y2milestone("Component %s ", dbIndexStr.c_str()); int dbIndex = -2; if ( dbIndexStr[0] == '{' ) { @@ -363,14 +368,92 @@ if ( (*i)->getIndex() == dbIndex ) { YCPMap resMap; - resMap.add( YCPString("suffix"), - YCPString( (*i)->getStringValue("olcSuffix") )); - resMap.add( YCPString("directory"), - YCPString( (*i)->getStringValue("olcDbDirectory") )); - resMap.add( YCPString("rootdn"), - YCPString( (*i)->getStringValue("olcRootDn") )); - return resMap; + if ( path->length() == 1 ) + { + resMap.add( YCPString("suffix"), + YCPString( (*i)->getStringValue("olcSuffix") )); + resMap.add( YCPString("directory"), + YCPString( (*i)->getStringValue("olcDbDirectory") )); + resMap.add( YCPString("rootdn"), + YCPString( (*i)->getStringValue("olcRootDn") )); + return resMap; + } else { + std::string dbComponent = path->component_str(1); + y2milestone("Component %s ", dbComponent.c_str()); + IndexMap idx = (*i)->getIndexes(); + IndexMap::const_iterator j = idx.begin(); + for ( ; j != idx.end(); j++ ) + { + YCPMap ycpIdx; + y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); + std::vector<IndexType>::const_iterator k = j->second.begin(); + for ( ; k != j->second.end(); k++ ) + { + if ( *k == Eq ) + ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); + } + resMap.add( YCPString(j->first), ycpIdx ); + } + return resMap; + } + } + } + return YCPNull(); +} + +bool comparesAttrTypes( const LDAPAttrType& a1, const LDAPAttrType& a2 ) +{ + return ( a1.getName() < a2.getName() ); +} + +YCPValue SlapdConfigAgent::ReadSchema( const YCPPath &path, + const YCPValue &arg, + const YCPValue &opt) +{ + if ( path->length() !=1 ) + { + y2milestone("Unsupported Path: %s", path->toString().c_str() ); + return YCPNull(); + } + else if ( path->component_str(0) == "attributeTypes" ) + { + if ( schema.size() == 0 ) + { + schema = olc.getSchemaNames(); + } + OlcSchemaList::const_iterator i; + YCPList resList; + for (i = schema.begin(); i != schema.end(); i++ ) + { + y2milestone("Schema: %s", (*i)->getName().c_str() ); + std::vector<LDAPAttrType> types = (*i)->getAttributeTypes(); + std::sort( types.begin(), types.end(), comparesAttrTypes ); + std::vector<LDAPAttrType>::const_iterator j; + for ( j = types.begin(); j != types.end(); j++ ) + { + YCPMap attrMap; + attrMap.add( YCPString("name"), YCPString( j->getName() ) ); + if ( j->getEqualityOid() != "" ) + { + attrMap.add( YCPString("equality"), YCPBoolean( true ) ); + } else { + attrMap.add( YCPString("equality"), YCPBoolean( false ) ); + } + if ( j->getSubstringOid() != "" ) + { + attrMap.add( YCPString("substring"), YCPBoolean( true ) ); + } else { + attrMap.add( YCPString("substring"), YCPBoolean( false ) ); + } + attrMap.add( YCPString("presence"), YCPBoolean( true ) ); + + // FIXME: how should "approx" indexing be handled, create + // whitelist based upon syntaxes? + + resList.add( attrMap ); + } } + return resList; } return YCPNull(); } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.h (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.h Fri Jun 27 15:58:36 2008 @@ -51,6 +51,11 @@ YCPValue ReadDatabase( const YCPPath &path, const YCPValue &arg = YCPNull(), const YCPValue &opt = YCPNull()); + + YCPValue ReadSchema( const YCPPath &path, + const YCPValue &arg = YCPNull(), + const YCPValue &opt = YCPNull()); + YCPBoolean WriteGlobal( const YCPPath &path, const YCPValue &arg = YCPNull(), const YCPValue &opt = YCPNull()); Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:36 2008 @@ -65,11 +65,15 @@ OlcBdbDatabase::OlcBdbDatabase( const LDAPEntry& le) : OlcDatabase(le) { } -OlcBdbDatabase::IndexMap OlcBdbDatabase::getIndexes() +IndexMap OlcBdbDatabase::getIndexes() const { - const LDAPAttributeList *al = m_dbEntry.getAttributes(); + const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); const LDAPAttribute *attr = al->getAttributeByName("olcdbindex"); - OlcBdbDatabase::IndexMap res; + IndexMap res; + if (! attr ) { + return res; + }; + StringList sl = attr->getValues(); StringList::const_iterator i; for (i = sl.begin(); i != sl.end(); i++ ) { @@ -84,7 +88,7 @@ indexes = i->substr( pos, std::string::npos ); std::cout << "Indexes: <" << indexes << ">" << std::endl; std::string::size_type oldpos = 0; - std::vector<OlcBdbDatabase::IndexType> idx; + std::vector<IndexType> idx; do { pos = indexes.find( ',', oldpos ); std::string index = indexes.substr( oldpos, @@ -92,23 +96,23 @@ std::cout << "Index: <" << index << ">" << std::endl; oldpos = indexes.find_first_not_of( ", ", pos ); if ( index == "pres" ) { - idx.push_back(OlcBdbDatabase::Present); + idx.push_back(Present); } else if (index == "eq" ) { - idx.push_back(OlcBdbDatabase::Eq); + idx.push_back(Eq); } else if (index == "approx" ) { - idx.push_back(OlcBdbDatabase::Approx); + idx.push_back(Approx); } else if (index == "sub" ) { - idx.push_back(OlcBdbDatabase::Sub); + idx.push_back(Sub); } else if (index == "subinital" ) { - idx.push_back(OlcBdbDatabase::SpecialSubInitial); + idx.push_back(SpecialSubInitial); } else if (index == "subany" ) { - idx.push_back(OlcBdbDatabase::SpecialSubAny); + idx.push_back(SpecialSubAny); } else if (index == "subfinal" ) { - idx.push_back(OlcBdbDatabase::SpecialSubFinal); + idx.push_back(SpecialSubFinal); } else if (index == "nolang" ) { - idx.push_back(OlcBdbDatabase::SpecialNoLang); + idx.push_back(SpecialNoLang); } else if (index == "nosubtypes" ) { - idx.push_back(OlcBdbDatabase::SpecialNoSubTypes); + idx.push_back(SpecialNoSubTypes); } } while (pos != std::string::npos); res.insert(make_pair(attrType, idx)); @@ -296,6 +300,26 @@ return m_name; } +const std::vector<LDAPAttrType> OlcSchemaConfig::getAttributeTypes() const +{ + std::vector<LDAPAttrType> res; + StringList types = this->getStringValues("olcAttributeTypes"); + StringList::const_iterator j; + for ( j = types.begin(); j != types.end(); j++ ) + { + LDAPAttrType currentAttr; + if ( (*j)[0] == '{' ) + { + std::string::size_type pos = j->find('}'); + currentAttr = LDAPAttrType( j->substr( pos+1, std::string::npos ) ); + } else { + currentAttr = LDAPAttrType( *j ); + } + res.push_back(currentAttr); + } + return res; +} + OlcTlsSettings OlcGlobalConfig::getTlsSettings() const { std::cout << "OlcTlsSettings OlcGlobalConfig::getTlsSettings() const " << std::endl; @@ -780,9 +804,8 @@ OlcSchemaList res; try { StringList attrs; - attrs.add("cn"); LDAPSearchResults *sr = m_lc->search( "cn=schema,cn=config", - LDAPConnection::SEARCH_ONE, "objectclass=olcSchemaConfig", attrs ); + LDAPConnection::SEARCH_SUB, "objectclass=olcSchemaConfig" ); LDAPEntry *entry; while ( entry = sr->getNext() ) { Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:36 2008 @@ -8,6 +8,7 @@ #include <map> #include <vector> #include <LDAPEntry.h> +#include <LDAPAttrType.h> #include <boost/shared_ptr.hpp> class OlcConfigEntry @@ -61,6 +62,21 @@ LDAPEntry m_dbEntryChanged; }; +enum IndexType { + Default, + Present, + Eq, + Approx, + Sub, + SpecialSubInitial, + SpecialSubAny, + SpecialSubFinal, + SpecialNoLang, + SpecialNoSubTypes, +}; + +typedef std::map<std::string, std::vector<IndexType> > IndexMap; + class OlcDatabase : public OlcConfigEntry { public : @@ -79,6 +95,8 @@ const std::string getType() const; virtual std::map<std::string, std::list<std::string> > toMap() const; + virtual IndexMap getIndexes() const {}; + protected: virtual void updateEntryDn(); @@ -94,21 +112,8 @@ virtual std::map<std::string, std::list<std::string> > toMap() const; void setDirectory( const std::string &dir); - enum IndexType { - Default, - Present, - Eq, - Approx, - Sub, - SpecialSubInitial, - SpecialSubAny, - SpecialSubFinal, - SpecialNoLang, - SpecialNoSubTypes, - }; - typedef std::map<std::string, std::vector<OlcBdbDatabase::IndexType> > IndexMap; - IndexMap getIndexes(); + virtual IndexMap getIndexes() const; }; class OlcTlsSettings; @@ -141,6 +146,7 @@ OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2); virtual void clearChangedEntry(); const std::string& getName() const; + const std::vector<LDAPAttrType> getAttributeTypes() const; private: std::string m_name; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:36 2008 @@ -985,6 +985,40 @@ return true; } +define boolean cb_read_bdb_index() +{ + integer index = (integer) widget_map[current_tree_item, "index"]:nil; + y2milestone("cb_read_bdb_index current item: %1, index %2", current_tree_item, index); + map<string, map<string, boolean> > idxMap = LdapServer::GetDatabaseIndexes( index ); + integer i=0; + list newItems = []; + foreach( string attr, map<string, boolean> idx, idxMap, { + string eqIdx = _("No"); + string presIdx = _("No"); + string substrIdx = _("No"); + string approxIdx = _("No"); + y2milestone("index attr: %1", attr); + if ( idx["eq"]:false ) + { + y2milestone("eq index"); + eqIdx = _("Yes"); + } + newItems = add( newItems, `item( `id(i), attr, presIdx, eqIdx, substrIdx, approxIdx ) ); + } ); + UI::ChangeWidget( `tab_idx, `Items , newItems ); + + return true; +} + +define boolean cb_input_bdb_index() +{ + y2milestone("cb_input_bdb_index, handlercmd: %1", handler_cmd); + if ( handler_cmd == `pb_idx_add ) + { + AddIndexPopup(); + } + return true; +} /***************************************** ** tree structure definition ** @@ -1063,9 +1097,16 @@ void addDatabaseWidgetMap( string suffix, string item_name, integer index, boolean new_db ) { if( haskey( widget_map, item_name ) ) return; - + map<string, any> dbIndex = $[ + "name" : _("Index Configuration"), + "widget" : editBdbIndexes, + "index" : index, + "cb_read" : ``(cb_read_bdb_index() ), + "cb_input" : ``(cb_input_bdb_index() ) + ]; map<string,any> item_map = $[ "name" : suffix, + "children" : [ item_name + "_index" ], "index" : index, "widget" : editBdbDatabase, "new_db" : new_db, @@ -1078,6 +1119,8 @@ ]; y2milestone( "adding database item '%1' as '%2'", suffix, item_name ); widget_map[item_name] = item_map; + widget_map[item_name + "_index"] = dbIndex; + widget_map["databases","children"] = add( widget_map["databases","children"]:[], item_name ); } Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:58:36 2008 @@ -1,6 +1,7 @@ { textdomain "ldap-server"; + map<string, any> firewall_settings = $[ "services": [ "ldap" , "ldaps" ], "display_details": true, @@ -329,6 +330,22 @@ generalDbWidget ); + term editBdbIndexes = + `VBox( + `Heading( _("Edit Index Configuration") ), + `Table( + `id( `tab_idx ), + `header( "Attrbute", "pres", "eq", "sub", "approx"), + [ ] + ), + `HSquash( + `HBox( + `PushButton( `id( `pb_idx_add ), _("Add") ), + `PushButton( `id( `pb_idx_edit ), _("Edit") ), + `PushButton( `id( `pb_idx_del ), _("Delete") ) + ) + ) + ); term editPolicy = `VBox( `VSpacing( 1 ), @@ -372,5 +389,39 @@ ) ) ); -} + define boolean AddIndexPopup() + { + term content = + `VBox( + `Heading( _("Add Index") ), + `ComboBox( `id( `cb_attrs ), `opt( `hstretch ), "Attributetypes" ), + `HBox( + `PushButton( `id( `pb_ok ), Label::OKButton() ), + `PushButton( `id( `pb_cancel ), Label::CancelButton() ) + ) + ); + list<map<string,any> > attrTypes = (list<map <string,any> >) SCR::Read( .ldapserver.schema.attributeTypes ); + list<string> items = []; + foreach( map<string,any> attr, attrTypes, { + items = add( items, (string)attr["name"]:"" ); + y2milestone( "%1 (eq:%2)", (string)attr["name"]:"", (boolean)attr["equality"]:false ); + } ); + UI::OpenDialog( `opt(`decorated), content ); + UI::ChangeWidget( `cb_attrs, `Items, items ); + while (true) + { + any ret = UI::UserInput(); + if (ret == `pb_cancel ) + { + break; + } + if (ret == `pb_ok ) + { + break; + } + } + UI::CloseDialog(); + return true; + } +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48617 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:30 2008 New Revision: 48617 URL: http://svn.opensuse.org/viewcvs/yast?rev=48617&view=rev Log: Schema delete through back-config is not supported in OpenLDAP 2.4 Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:30 2008 @@ -79,6 +79,7 @@ if( l == nil ) l = []; //widget_map["g_schema","inclist"] = l; UI::ChangeWidget( `sb_schemalist, `Items, l ); + UI::ChangeWidget( `pb_delete, `Enabled, false ); if( select_item != nil ) { UI::ChangeWidget( `sb_schemalist, `CurrentItem, select_item ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48616 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:27 2008 New Revision: 48616 URL: http://svn.opensuse.org/viewcvs/yast?rev=48616&view=rev Log: delete implementation for Schema Entries Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:58:27 2008 @@ -573,7 +573,17 @@ my $rc = SCR->Write(".ldapserver.schema.addFromLdif", $file); - return 1; + return $rc; +} + +BEGIN { $TYPEINFO {RemoveFromSchemaList} = ["function", "boolean", "string" ]; } +sub RemoveFromSchemaList +{ + my ($self, $name) = @_; + + my $rc = SCR->Write(".ldapserver.schema.remove", $name); + + return $rc; } BEGIN { $TYPEINFO {UpdateDatabase} = ["function", "boolean", "integer", [ "map" , "string", "string"] ]; } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:27 2008 @@ -389,7 +389,10 @@ YCPList resultList; for (i = schema.begin(); i != schema.end(); i++ ) { - resultList.add( YCPString( (*i)->getName() ) ); + if (! (*i)->getName().empty() ) + { + resultList.add( YCPString( (*i)->getName() ) ); + } } return resultList; } @@ -553,6 +556,21 @@ entry = ldif.getEntryRecord(); schema.push_back( boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig(oldEntry, entry)) ); } + return YCPBoolean(true); + } + if ( subpath == "remove" ) + { + std::string name = arg->asString()->value_cstr(); + y2milestone("remove Schema Entry: %s", name.c_str()); + OlcSchemaList::const_iterator i; + for (i = schema.begin(); i != schema.end(); i++ ) + { + if ( (*i)->getName() == name ) + { + (*i)->clearChangedEntry(); + } + } + return YCPBoolean(true); } return YCPBoolean(false); } Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:27 2008 @@ -285,6 +285,12 @@ } } +void OlcSchemaConfig::clearChangedEntry() +{ + OlcConfigEntry::clearChangedEntry(); + m_name = ""; +} + const std::string& OlcSchemaConfig::getName() const { return m_name; @@ -439,6 +445,12 @@ { } +void OlcConfigEntry::clearChangedEntry() +{ + m_dbEntryChanged = LDAPEntry(); +} + + std::map<std::string, std::list<std::string> > OlcDatabase::toMap() const { std::map<std::string, std::list<std::string> > resMap; @@ -585,6 +597,10 @@ { return ( this->getDn().empty() ); } +bool OlcConfigEntry::isDeletedEntry() const +{ + return ( (!this->getDn().empty()) && this->getUpdatedDn().empty() ); +} LDAPModList OlcConfigEntry::entryDifftoMod() const { LDAPAttributeList::const_iterator i = m_dbEntry.getAttributes()->begin(); @@ -723,6 +739,8 @@ if ( oce.isNewEntry () ) { m_lc->add(&oce.getChangedEntry()); + } else if (oce.isDeletedEntry() ) { + m_lc->del(oce.getDn()); } else { LDAPModList ml = oce.entryDifftoMod(); if ( ! ml.empty() ) { Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:27 2008 @@ -25,10 +25,16 @@ inline std::string getDn() const { return m_dbEntry.getDN(); } + inline std::string getUpdatedDn() const { + return m_dbEntryChanged.getDN(); + } inline const LDAPEntry& getChangedEntry() const { return m_dbEntryChanged; } + virtual void clearChangedEntry(); + bool isNewEntry() const; + bool isDeletedEntry() const; LDAPModList entryDifftoMod() const; @@ -133,6 +139,7 @@ OlcSchemaConfig(); OlcSchemaConfig(const LDAPEntry &e); OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2); + virtual void clearChangedEntry(); const std::string& getName() const; private: Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:27 2008 @@ -159,7 +159,7 @@ } else if( handler_cmd == `pb_delete ) { if( current_item == nil ) return true; -// inclist = remove( inclist, find_pos( inclist, current_item ) ); + LdapServer::RemoveFromSchemaList(current_item); list<string> inclist = LdapServer::GetSchemaList(); update_schemalist( inclist, nil ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48615 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc agent/SlapdConfigAgent.h lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:22 2008 New Revision: 48615 URL: http://svn.opensuse.org/viewcvs/yast?rev=48615&view=rev Log: Support for adding new Schema entries. Remove has yet to come Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/agent/SlapdConfigAgent.h trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:58:22 2008 @@ -566,6 +566,16 @@ return $rc; } +BEGIN { $TYPEINFO {AddLdifToSchemaList} = ["function", "boolean", "string" ]; } +sub AddLdifToSchemaList +{ + my ($self, $file) = @_; + + my $rc = SCR->Write(".ldapserver.schema.addFromLdif", $file); + + return 1; +} + BEGIN { $TYPEINFO {UpdateDatabase} = ["function", "boolean", "integer", [ "map" , "string", "string"] ]; } sub UpdateDatabase { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:22 2008 @@ -6,6 +6,7 @@ #include <LDAPEntry.h> #include <SaslInteraction.h> #include <sstream> +#include <fstream> #define DEFAULT_PORT 389 #define ANSWER 42 @@ -104,6 +105,9 @@ } else if ( path->component_str(0) == "database" ) { y2milestone("Database Write"); return WriteDatabase(path->at(1), arg, arg2); + } else if ( path->component_str(0) == "schema" ) { + y2milestone("Schema Write"); + return WriteSchema(path->at(1), arg, arg2); } else { return YCPNull(); } @@ -208,6 +212,11 @@ { olc.updateEntry(**i); } + OlcSchemaList::const_iterator j; + for ( j = schema.begin(); j != schema.end() ; j++ ) + { + olc.updateEntry(**j); + } } return YCPBoolean(true); } @@ -372,20 +381,19 @@ { y2milestone("Path %s Length %ld ", path->toString().c_str(), path->length()); - - OlcSchemaList schemaList = olc.getSchemaNames(); -// if ( databases.size() == 0 ) -// { -// databases = olc.getDatabases(); -// } + if ( schema.size() == 0 ) + { + schema = olc.getSchemaNames(); + } OlcSchemaList::const_iterator i; - YCPList schema; - for (i = schemaList.begin(); i != schemaList.end(); i++ ) + YCPList resultList; + for (i = schema.begin(); i != schema.end(); i++ ) { - schema.add( YCPString( (*i)->getName() ) ); + resultList.add( YCPString( (*i)->getName() ) ); } - return schema; + return resultList; } + YCPBoolean SlapdConfigAgent::WriteGlobal( const YCPPath &path, const YCPValue &arg, const YCPValue &arg2) @@ -524,6 +532,31 @@ return YCPBoolean(false); } +YCPBoolean SlapdConfigAgent::WriteSchema( const YCPPath &path, + const YCPValue &arg, + const YCPValue &arg2) +{ + y2milestone("Path %s Length %ld ", path->toString().c_str(), + path->length()); + + y2milestone("WriteSchema"); + std::string subpath = path->component_str(0); + if ( subpath == "addFromLdif" ) + { + std::string filename = arg->asString()->value_cstr(); + y2milestone("adding Ldif File: %s", filename.c_str()); + std::ifstream ldifFile(filename.c_str()); + LdifReader ldif(ldifFile); + if ( ldif.readNextRecord() ) + { + LDAPEntry entry, oldEntry; + entry = ldif.getEntryRecord(); + schema.push_back( boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig(oldEntry, entry)) ); + } + } + return YCPBoolean(false); +} + YCPString SlapdConfigAgent::ConfigToLdif() const { y2milestone("ConfigToLdif"); Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.h (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.h Fri Jun 27 15:58:22 2008 @@ -57,11 +57,15 @@ YCPBoolean WriteDatabase( const YCPPath &path, const YCPValue &arg = YCPNull(), const YCPValue &opt = YCPNull()); + YCPBoolean WriteSchema( const YCPPath &path, + const YCPValue &arg = YCPNull(), + const YCPValue &opt = YCPNull()); YCPString ConfigToLdif() const; private: OlcConfig olc; OlcDatabaseList databases; + OlcSchemaList schema; boost::shared_ptr<OlcGlobalConfig> globals; boost::shared_ptr<OlcSchemaConfig> schemaBase; }; Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:22 2008 @@ -269,6 +269,21 @@ entryIndex = 0; } } +OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2) : OlcConfigEntry(e1, e2) +{ + std::cout << "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)" << std::endl; + std::string name(this->getStringValue("cn")); + if ( name[0] == '{' ) + { + std::string::size_type pos = name.find('}'); + std::istringstream indexstr(name.substr(1, pos-1)); + indexstr >> entryIndex; + m_name = name.substr( pos+1, std::string::npos ); + } else { + m_name = name; + entryIndex = 0; + } +} const std::string& OlcSchemaConfig::getName() const { @@ -566,9 +581,16 @@ return ldifStream.str(); } +bool OlcConfigEntry::isNewEntry() const +{ + return ( this->getDn().empty() ); +} + LDAPModList OlcConfigEntry::entryDifftoMod() const { LDAPAttributeList::const_iterator i = m_dbEntry.getAttributes()->begin(); LDAPModList modifications; + std::cout << "Old Entry DN: " << m_dbEntry.getDN() << std::endl; + std::cout << "New Entry DN: " << m_dbEntryChanged.getDN() << std::endl; for(; i != m_dbEntry.getAttributes()->end(); i++ ) { std::cout << i->getName() << std::endl; @@ -698,11 +720,16 @@ void OlcConfig::updateEntry( const OlcConfigEntry &oce ) { try { - LDAPModList ml = oce.entryDifftoMod(); - if ( ! ml.empty() ) { - m_lc->modify( oce.getDn(), &ml ); + if ( oce.isNewEntry () ) + { + m_lc->add(&oce.getChangedEntry()); } else { - std::cout << oce.getDn() << ": no changes" << std::endl; + LDAPModList ml = oce.entryDifftoMod(); + if ( ! ml.empty() ) { + m_lc->modify( oce.getDn(), &ml ); + } else { + std::cout << oce.getDn() << ": no changes" << std::endl; + } } } catch (LDAPException e) { std::cout << e << std::endl; Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:22 2008 @@ -21,9 +21,15 @@ inline OlcConfigEntry() : m_dbEntry(), m_dbEntryChanged() {} inline OlcConfigEntry(const LDAPEntry& le) : m_dbEntry(le), m_dbEntryChanged(le) {} + inline OlcConfigEntry(const LDAPEntry& le, const LDAPEntry& le1) : m_dbEntry(le), m_dbEntryChanged(le1) {} inline std::string getDn() const { return m_dbEntry.getDN(); } + inline const LDAPEntry& getChangedEntry() const { + return m_dbEntryChanged; + } + bool isNewEntry() const; + LDAPModList entryDifftoMod() const; StringList getStringValues(const std::string &type) const; @@ -126,6 +132,7 @@ public: OlcSchemaConfig(); OlcSchemaConfig(const LDAPEntry &e); + OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2); const std::string& getName() const; private: Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:22 2008 @@ -141,7 +141,7 @@ { //add a new file to the list /* file dialog heading */ - string new_item = UI::AskForExistingFile( "/etc/openldap/schema/", "*.schema *", _("Select New Schema File") ); + string new_item = UI::AskForExistingFile( "/etc/openldap/schema/", "*.ldif *", _("Select New Schema File") ); if( new_item == nil ) return true; @@ -152,7 +152,7 @@ return false; } -// LdapServer::AddItemToSchemaList(new_item); + LdapServer::AddLdifToSchemaList(new_item); list<string> inclist = LdapServer::GetSchemaList(); update_schemalist( inclist, new_item ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48614 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:16 2008 New Revision: 48614 URL: http://svn.opensuse.org/viewcvs/yast?rev=48614&view=rev Log: remove unneeded "Up" and "Down" Buttons from Schema widget Modified: trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:16 2008 @@ -77,8 +77,7 @@ void update_schemalist( list<string> l, string select_item ) { if( l == nil ) l = []; - widget_map["g_schema","inclist"] = l; - /* schema file selection box title */ + //widget_map["g_schema","inclist"] = l; UI::ChangeWidget( `sb_schemalist, `Items, l ); if( select_item != nil ) { @@ -133,69 +132,12 @@ ``{ y2milestone( "calling schema input handler" ); - list<string> inclist = (list<string>)widget_map["g_schema","inclist"]:[]; + + list<string> inclist = LdapServer::GetSchemaList(); string current_item = (string)UI::QueryWidget( `sb_schemalist, `CurrentItem ); y2milestone( "current_item is '%1'", current_item ); - if( handler_cmd == `pb_up || handler_cmd == `pb_down ) - { - if( current_item == nil ) return true; - - y2milestone( "inclist is '%1'", inclist ); - if( inclist == [] ) return true; - integer pos = find_pos( inclist, current_item ); - y2milestone( "pos is '%1'", pos ); - if( pos == -1 ) return true; - - list<string> new_inclist = []; - - if( handler_cmd == `pb_up ) - { - //move the current item up - - if( pos == 0 ) return true; - - //exchange the items at pos and pos-1 - integer i = 0; - while( i < size( inclist ) ) - { - if( i == pos-1 ) - { - new_inclist = add( new_inclist, inclist[i+1]:"" ); - } else if( i == pos ) - { - new_inclist = add( new_inclist, inclist[i-1]:"" ); - } else - { - new_inclist = add( new_inclist, inclist[i]:"" ); - } - i = i + 1; - } - } else if( handler_cmd == `pb_down ) - { - //move the current item down - - if( pos == size(inclist)-1 ) return true; - - //exchange the items at pos and pos+1 - integer i = 0; - while( i < size( inclist ) ) - { - if( i == pos+1 ) - { - new_inclist = add( new_inclist, inclist[i-1]:"" ); - } else if( i == pos ) - { - new_inclist = add( new_inclist, inclist[i+1]:"" ); - } else - { - new_inclist = add( new_inclist, inclist[i]:"" ); - } - i = i + 1; - } - } - update_schemalist( new_inclist, current_item ); - } else if( handler_cmd == `pb_add ) + if( handler_cmd == `pb_add ) { //add a new file to the list /* file dialog heading */ @@ -210,13 +152,15 @@ return false; } - inclist = add( inclist, new_item ); +// LdapServer::AddItemToSchemaList(new_item); + list<string> inclist = LdapServer::GetSchemaList(); update_schemalist( inclist, new_item ); } else if( handler_cmd == `pb_delete ) { if( current_item == nil ) return true; - inclist = remove( inclist, find_pos( inclist, current_item ) ); +// inclist = remove( inclist, find_pos( inclist, current_item ) ); + list<string> inclist = LdapServer::GetSchemaList(); update_schemalist( inclist, nil ); } return true; Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:58:16 2008 @@ -75,22 +75,14 @@ ); term schemaWidget = - `HBox( - `VBox( - `SelectionBox( `id( `sb_schemalist ), _("Included &Schema Files"), [] ), - `Left( - `HBox( - `PushButton( `id( `pb_add ), Label::AddButton() ), - `HSpacing( 0.5 ), - `PushButton( `id( `pb_delete ), Label::DeleteButton() ) - ) - ), - `VSpacing( 1 ) - ), - `HSpacing( 0.5 ), - `VBox( - `PushButton( `id( `pb_up ), Label::UpButton() ), - `PushButton( `id( `pb_down ), Label::DownButton() ) + `VBox( + `SelectionBox( `id( `sb_schemalist ), _("Included &Schema Files"), [] ), + `Left( + `HBox( + `PushButton( `id( `pb_add ), Label::AddButton() ), + `HSpacing( 0.5 ), + `PushButton( `id( `pb_delete ), Label::DeleteButton() ) + ) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48613 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc agent/SlapdConfigAgent.h lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:12 2008 New Revision: 48613 URL: http://svn.opensuse.org/viewcvs/yast?rev=48613&view=rev Log: Started work on Schema management Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/agent/SlapdConfigAgent.h trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:58:12 2008 @@ -556,6 +556,16 @@ return $rc; } +BEGIN { $TYPEINFO {GetSchemaList} = ["function", [ "list" , "string"] ]; } +sub GetSchemaList +{ + my $self = @_; + y2milestone("GetSchemaList "); + my $rc = SCR->Read(".ldapserver.schemaList" ); + y2milestone( "SchemaList: ".Data::Dumper->Dump([$rc]) ); + return $rc; +} + BEGIN { $TYPEINFO {UpdateDatabase} = ["function", "boolean", "integer", [ "map" , "string", "string"] ]; } sub UpdateDatabase { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:12 2008 @@ -70,7 +70,12 @@ { y2milestone("read databases"); return ReadDatabases(path->at(1), arg, opt); - } + } + else if ( path->component_str(0) == "schemaList" ) + { + y2milestone("read databases"); + return ReadSchemaList(path->at(1), arg, opt); + } else if ( path->component_str(0) == "database" ) { y2milestone("read database"); @@ -361,6 +366,26 @@ return YCPNull(); } +YCPValue SlapdConfigAgent::ReadSchemaList( const YCPPath &path, + const YCPValue &arg, + const YCPValue &opt) +{ + y2milestone("Path %s Length %ld ", path->toString().c_str(), + path->length()); + + OlcSchemaList schemaList = olc.getSchemaNames(); +// if ( databases.size() == 0 ) +// { +// databases = olc.getDatabases(); +// } + OlcSchemaList::const_iterator i; + YCPList schema; + for (i = schemaList.begin(); i != schemaList.end(); i++ ) + { + schema.add( YCPString( (*i)->getName() ) ); + } + return schema; +} YCPBoolean SlapdConfigAgent::WriteGlobal( const YCPPath &path, const YCPValue &arg, const YCPValue &arg2) Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.h (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.h Fri Jun 27 15:58:12 2008 @@ -37,12 +37,17 @@ protected: YCPValue ReadGlobal( const YCPPath &path, - const YCPValue &arg = YCPNull(), - const YCPValue &opt = YCPNull()); + const YCPValue &arg = YCPNull(), + const YCPValue &opt = YCPNull()); YCPValue ReadDatabases( const YCPPath &path, - const YCPValue &arg = YCPNull(), - const YCPValue &opt = YCPNull()); + const YCPValue &arg = YCPNull(), + const YCPValue &opt = YCPNull()); + + YCPValue ReadSchemaList( const YCPPath &path, + const YCPValue &arg = YCPNull(), + const YCPValue &opt = YCPNull()); + YCPValue ReadDatabase( const YCPPath &path, const YCPValue &arg = YCPNull(), const YCPValue &opt = YCPNull()); Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:12 2008 @@ -254,6 +254,27 @@ m_dbEntryChanged.addAttribute(LDAPAttribute("cn", "schema")); } +OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e) +{ + std::cout << "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)" << std::endl; + std::string name(this->getStringValue("cn")); + if ( name[0] == '{' ) + { + std::string::size_type pos = name.find('}'); + std::istringstream indexstr(name.substr(1, pos-1)); + indexstr >> entryIndex; + m_name = name.substr( pos+1, std::string::npos ); + } else { + m_name = name; + entryIndex = 0; + } +} + +const std::string& OlcSchemaConfig::getName() const +{ + return m_name; +} + OlcTlsSettings OlcGlobalConfig::getTlsSettings() const { std::cout << "OlcTlsSettings OlcGlobalConfig::getTlsSettings() const " << std::endl; @@ -357,7 +378,7 @@ else if ( OlcConfigEntry::isScheamEntry(e) ) { std::cerr << "creating OlcSchemaConfig" << std::endl; - return new OlcConfigEntry(e); + return new OlcSchemaConfig(e); } else if ( OlcConfigEntry::isDatabaseEntry(e) ) { @@ -709,6 +730,28 @@ return res; } +OlcSchemaList OlcConfig::getSchemaNames() +{ + OlcSchemaList res; + try { + StringList attrs; + attrs.add("cn"); + LDAPSearchResults *sr = m_lc->search( "cn=schema,cn=config", + LDAPConnection::SEARCH_ONE, "objectclass=olcSchemaConfig", attrs ); + LDAPEntry *entry; + while ( entry = sr->getNext() ) + { + std::cout << "Got Schema Entry: " << entry->getDN() << std::endl; + boost::shared_ptr<OlcSchemaConfig> olce(new OlcSchemaConfig(*entry)); + res.push_back(olce); + } + } catch (LDAPException e ) { + std::cout << e << std::endl; + throw; + } + return res; +} + OlcTlsSettings::OlcTlsSettings( const OlcGlobalConfig &ogc ) : m_crlCheck(0), m_verifyCient(0) { Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:12 2008 @@ -125,18 +125,11 @@ { public: OlcSchemaConfig(); -}; + OlcSchemaConfig(const LDAPEntry &e); + const std::string& getName() const; -typedef std::list<boost::shared_ptr<OlcDatabase> > OlcDatabaseList; -class OlcConfig { - public: - OlcConfig(LDAPConnection *lc=0 ); - boost::shared_ptr<OlcGlobalConfig> getGlobals(); - void setGlobals( OlcGlobalConfig &olcg); - void updateEntry( const OlcConfigEntry &oce ); - OlcDatabaseList getDatabases(); private: - LDAPConnection *m_lc; + std::string m_name; }; class OlcTlsSettings { @@ -171,4 +164,23 @@ std::string m_crlFile; }; +typedef std::list<boost::shared_ptr<OlcDatabase> > OlcDatabaseList; +typedef std::list<boost::shared_ptr<OlcSchemaConfig> > OlcSchemaList; +class OlcConfig { + + public: + OlcConfig(LDAPConnection *lc=0 ); + + boost::shared_ptr<OlcGlobalConfig> getGlobals(); + OlcDatabaseList getDatabases(); + OlcSchemaList getSchemaNames(); + + void setGlobals( OlcGlobalConfig &olcg); + void updateEntry( const OlcConfigEntry &oce ); + + private: + LDAPConnection *m_lc; +}; + + #endif /* BACK_CONFIG_TEST_H */ Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:12 2008 @@ -74,12 +74,12 @@ ** global schema handlers *****************************/ -void show_new_schemalist( list<string> l, string select_item ) +void update_schemalist( list<string> l, string select_item ) { if( l == nil ) l = []; widget_map["g_schema","inclist"] = l; /* schema file selection box title */ - UI::ReplaceWidget( `rp_schemalist, `SelectionBox( `id( `sb_schemalist ), _("Included &Schema Files"), l ) ); + UI::ChangeWidget( `sb_schemalist, `Items, l ); if( select_item != nil ) { UI::ChangeWidget( `sb_schemalist, `CurrentItem, select_item ); @@ -89,9 +89,9 @@ define boolean cb_read_schema() ``{ y2milestone( "calling schema read handler" ); -// list<string> inclist = LdapServer::ReadSchemaIncludeList(); + list<string> inclist = LdapServer::GetSchemaList(); // //store current include list for later order changes -// show_new_schemalist( inclist, nil ); + update_schemalist( inclist, nil ); return true; } @@ -194,7 +194,7 @@ i = i + 1; } } - show_new_schemalist( new_inclist, current_item ); + update_schemalist( new_inclist, current_item ); } else if( handler_cmd == `pb_add ) { //add a new file to the list @@ -211,13 +211,13 @@ } inclist = add( inclist, new_item ); - show_new_schemalist( inclist, new_item ); + update_schemalist( inclist, new_item ); } else if( handler_cmd == `pb_delete ) { if( current_item == nil ) return true; inclist = remove( inclist, find_pos( inclist, current_item ) ); - show_new_schemalist( inclist, nil ); + update_schemalist( inclist, nil ); } return true; } @@ -340,50 +340,7 @@ UI::ChangeWidget( `te_ca_file, `Value, tls["caCertFile"]:"" ); UI::ChangeWidget( `te_cert_file, `Value, tls["certFile"]:"" ); UI::ChangeWidget( `te_key_file, `Value, tls["certKeyFile"]:"" ); -// map<string,string> importPaths = LdapServer::ReadImportCertificates(); -// boolean use_common_ca = LdapServer::ReadConfigureCommonServerCertificate(); -// map<string,string> tlsSettings = (map<string,string>)LdapServer::ReadTlsSettings(); -// -// /* tls configuration info text 1/4 */ -// string info = HTML::Bold( _("Current Configuration:") )+HTML::Newline()+HTML::ListStart(); -// foreach( string key, string val, tlsSettings, { -// if ( val != nil ) { -// info = info + HTML::ListItem( HTML::Bold( key ) + ": " + val ); -// } -// } ); -// info = info + HTML::ListEnd() + HTML::Newline(); -// /* tls configuration info text 2/4 */ -// info = info + HTML::Bold( _("The following changes will be made:") )+HTML::Newline() + HTML::Newline(); -// -// if( use_common_ca ) -// { -// /* tls configuration info text 3/4 */ -// info = info + _("Configuring Common Server Certificate") + HTML::Newline(); -// } else if( haskey( importPaths, "ServerCertificateFile" ) ) -// { -// /* tls configuration info text 4/4 */ -// info = info + _("Importing the Following Certificates:") + HTML::Newline() + HTML::ListStart(); -// foreach( string key, string val, importPaths, { -// info = info + HTML::ListItem( HTML::Bold( key ) + ": " + val ); -// } ); -// -// info = info + HTML::ListEnd(); -// } -// -// UI::ChangeWidget( `rt_tls_info, `Value, info ); -// -// if( use_common_ca -// || haskey( importPaths, "ServerCertificateFile" ) -// || ( tlsSettings["TLSCertificateFile"]:nil != nil && tlsSettings["TLSCertificateKeyFile"]:nil != nil ) -// ) -// { -// UI::ChangeWidget( `rb_yes, `Value, true ); -// } else -// { -// UI::ChangeWidget( `rb_no, `Value, true ); -// UI::ChangeWidget( `rt_tls_info, `Enabled, false ); -// UI::ChangeWidget( `pb_edit, `Enabled, false ); -// } + return true; } Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:58:12 2008 @@ -77,9 +77,7 @@ term schemaWidget = `HBox( `VBox( - `ReplacePoint( - `id( `rp_schemalist ), `Empty() - ), + `SelectionBox( `id( `sb_schemalist ), _("Included &Schema Files"), [] ), `Left( `HBox( `PushButton( `id( `pb_add ), Label::AddButton() ), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48612 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:07 2008 New Revision: 48612 URL: http://svn.opensuse.org/viewcvs/yast?rev=48612&view=rev Log: More work on Read/Write Support for TLS settings Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:07 2008 @@ -311,7 +311,35 @@ define boolean cb_read_tls() ``{ y2milestone( "calling tls read handler" ); - LdapServer::GetTlsConfig(); + map<string, any> tls = LdapServer::GetTlsConfig(); + y2milestone( "tls config %1", tls ); + if ( (string)tls["caCertFile"]:"" != "" && + (string)tls["certFile"]:"" != "" && + (string)tls["certKeyFile"]:"" != "" ) + { + UI::ChangeWidget( `cb_tls_enabled, `Value, true ); + UI::ChangeWidget( `cb_ssl_listener_enabled, `Enabled, true ); + + if ( (string)tls["caCertFile"]:"" == "/etc/ssl/certs/YaST-CA.pem" && + (string)tls["certFile"]:"" == "/etc/ssl/servercerts/servercert.pem" && + (string)tls["certKeyFile"]:"" == "/etc/ssl/servercerts/serverkey.pem" ) + { + UI::ChangeWidget( `cb_use_common_cert, `Value, true ); + UI::ChangeWidget( `fr_import_cert , `Enabled, false ); + } else { + UI::ChangeWidget( `cb_use_common_cert, `Value, false ); + UI::ChangeWidget( `fr_import_cert , `Enabled, true ); + } + } + else + { + UI::ChangeWidget( `cb_ssl_listener_enabled, `Enabled, false ); + UI::ChangeWidget( `cb_use_common_cert, `Enabled, false ); + UI::ChangeWidget( `fr_import_cert, `Enabled, false ); + } + UI::ChangeWidget( `te_ca_file, `Value, tls["caCertFile"]:"" ); + UI::ChangeWidget( `te_cert_file, `Value, tls["certFile"]:"" ); + UI::ChangeWidget( `te_key_file, `Value, tls["certKeyFile"]:"" ); // map<string,string> importPaths = LdapServer::ReadImportCertificates(); // boolean use_common_ca = LdapServer::ReadConfigureCommonServerCertificate(); // map<string,string> tlsSettings = (map<string,string>)LdapServer::ReadTlsSettings(); @@ -383,7 +411,7 @@ // LdapServer::WriteConfigureCommonServerCertificate( false ); // LdapServer::WriteImportCertificates( $[] ); map<string,any> tlsSettings = $[ - "certKeyFIle" : "", + "certKeyFile" : "", "certFile" : "", "caCertFile" : "", "caCertDir" : "", @@ -412,6 +440,11 @@ if ( common_cert_available ) { UI::ChangeWidget( `cb_use_common_cert, `Enabled, true ); + UI::ChangeWidget( `cb_use_common_cert, `Value, true ); + UI::ChangeWidget( `te_ca_file, `Value, "/etc/ssl/certs/YaST-CA.pem"); + UI::ChangeWidget( `te_cert_file, `Value, "/etc/ssl/servercerts/servercert.pem"); + UI::ChangeWidget( `te_key_file, `Value, "/etc/ssl/servercerts/serverkey.pem"); + UI::ChangeWidget( `fr_import_cert, `Enabled, false ); } else { UI::ChangeWidget( `fr_import_cert, `Enabled, true ); } @@ -431,7 +464,7 @@ { UI::ChangeWidget( `te_ca_file, `Value, "/etc/ssl/certs/YaST-CA.pem"); UI::ChangeWidget( `te_cert_file, `Value, "/etc/ssl/servercerts/servercert.pem"); - UI::ChangeWidget( `te_key_file, `Value, "/etc/ssl/servercerts/servercert.pem"); + UI::ChangeWidget( `te_key_file, `Value, "/etc/ssl/servercerts/serverkey.pem"); UI::ChangeWidget( `fr_import_cert, `Enabled, false ); } else { Popup::Error( _("A common server certificate is not available") ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48611 - /trunk/ldap-server/src/lib/backConfigTest.cpp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:04 2008 New Revision: 48611 URL: http://svn.opensuse.org/viewcvs/yast?rev=48611&view=rev Log: Don't specify values when all attributes are deleted Modified: trunk/ldap-server/src/lib/backConfigTest.cpp Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:04 2008 @@ -600,7 +600,7 @@ replace = true; } else { modifications.addModification( - LDAPModification( LDAPAttribute(i->getName(), delValues), + LDAPModification( LDAPAttribute(i->getName()), LDAPModification::OP_DELETE) ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0