Author: rhafer
Date: Fri Aug 8 17:24:02 2008
New Revision: 49887
URL: http://svn.opensuse.org/viewcvs/yast?rev=49887&view=rev
Log:
re-use the LdapDatabase-Widgets in Proposal
Modified:
trunk/ldap-server/src/LdapDatabase.ycp
trunk/ldap-server/src/LdapServer.pm
trunk/ldap-server/src/dialogs.ycp
Modified: trunk/ldap-server/src/LdapDatabase.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=49887&r1=49886&r2=49887&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapDatabase.ycp (original)
+++ trunk/ldap-server/src/LdapDatabase.ycp Fri Aug 8 17:24:02 2008
@@ -10,15 +10,20 @@
module "Database";
- map baseDb = $[];
+ map baseDb = $[];
boolean createDbDir = false;
- define symbol AddDbBasic()
+ global define symbol AddDbBasic( boolean createDefaults )
{
boolean user_changed_dbdir = false;
- list dblist = LdapServer::ReadDatabaseList();
- integer numDbs = size(dblist)-2; // don't count frontend and Config DB
+ map db = $[];
+ integer numDbs = 0;
+ if ( ! createDefaults )
+ {
+ list dblist = LdapServer::ReadDatabaseList();
+ numDbs = size(dblist)-2; // don't count frontend and Config DB
+ }
string caption = _("New Database");
string enctype = "SSHA";
list enc_types = [
@@ -81,6 +86,28 @@
);
Wizard::SetContentsButtons(caption, addDbWidget, "",
Label::BackButton(), Label::NextButton());
+ if ( createDefaults )
+ {
+ db = LdapServer::CreateInitialDefaults();
+ boolean append_checked = true;
+
+ if( db["rootdn"]:"" != "" )
+ {
+ integer pos = search( db["rootdn"]:"", db["suffix"]:"" );
+ if( pos > -1 )
+ {
+ db["rootdn"] = substring( db["rootdn"]:"", 0, pos-1 );
+ } else
+ {
+ append_checked = false;
+ }
+ }
+ UI::ChangeWidget(`id( `te_basedn), `Value, db["suffix"]:"" );
+ UI::ChangeWidget(`id( `te_rootdn), `Value, db["rootdn"]:"" );
+ UI::ChangeWidget(`id( `cb_append_basedn), `Value, append_checked );
+ UI::ChangeWidget(`id( `te_directory), `Value, db["directory"]:"" );
+ UI::ChangeWidget(`id( `cb_cryptmethod), `Value, db["pwenctype"]:"" );
+ }
symbol ret = `next;
while(true) {
ret = (symbol)UI::UserInput();
@@ -129,19 +156,22 @@
continue;
}
- list > dblist = LdapServer::ReadDatabaseList();
- boolean exists = false;
- foreach(map db, dblist, {
- if ( suffix == db["suffix"]:"" )
+ if ( ! createDefaults )
+ {
+ list > dblist = LdapServer::ReadDatabaseList();
+ boolean exists = false;
+ foreach(map db, dblist, {
+ if ( suffix == db["suffix"]:"" )
+ {
+ Popup::Error( _("A database with that Base DN already exists.") );
+ exists = true;
+ break;
+ }
+ } );
+ if ( exists )
{
- Popup::Error( _("A database with that Base DN already exists.") );
- exists = true;
- break;
+ continue;
}
- } );
- if ( exists )
- {
- continue;
}
if( rootpw != "" && rootdn == "" )
{
@@ -169,12 +199,11 @@
createDbDir = true;
}
}
- //create new database
- map db = $[
- "suffix" : suffix,
- "directory" : directory,
- "type" : "hdb",
- ];
+
+ db = add( db, "suffix", suffix );
+ db = add( db, "directory", directory );
+ db = add( db, "type", "hdb" );
+
if( rootdn != "" && (boolean)UI::QueryWidget( `cb_append_basedn, `Value ) )
{
rootdn = rootdn+","+suffix;
@@ -245,7 +274,7 @@
global define any AddDbWizard()
{
map aliases = $[
- "basics" : ``( AddDbBasic() ),
+ "basics" : ``( AddDbBasic(false) ),
"syncprov" : ``( DbSyncProv() ),
"ppolicy" : ``( DbPpolicy() )
];
@@ -273,7 +302,7 @@
return ret;
}
- global define map GetDatabase()
+ global define map GetDatabase()
{
return baseDb;
}
Modified: trunk/ldap-server/src/LdapServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=49887&r1=49886&r2=49887&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapServer.pm (original)
+++ trunk/ldap-server/src/LdapServer.pm Fri Aug 8 17:24:02 2008
@@ -586,7 +586,7 @@
.'<p>'._("Start LDAP Server: ").'<code>'.($defaults->{'serviceEnabled'}->value?_("Yes"):_("No")).'</code></p>'
.'<p>'._("Register at SLP Service: ").'<code>'.($defaults->{'slpRegister'}->value?_("Yes"):_("No")).'</code></p>'
.'<h2>'._("Create initial Database with the following Parameters").'</h2>'
- .'<p>'._("Database Suffix: ").'<code>'.$defaults->{'basedn'}.'</code></p>'
+ .'<p>'._("Database Suffix: ").'<code>'.$defaults->{'suffix'}.'</code></p>'
.'<p>'._("Administrator DN: ").'<code>'.$defaults->{'rootdn'}.'</code></p>';
return $string;
@@ -935,8 +935,9 @@
push @rdn, "dc=".$rdn;
}
my $basedn = join ',', @rdn ;
- y2milestone("basedn: $basedn");
- $dbDefaults{'basedn'} = $basedn;
+ y2milestone("suffix: $basedn");
+ $dbDefaults{'suffix'} = $basedn;
+ $dbDefaults{'directory'} = "/var/lib/ldap";
$dbDefaults{'rootdn'} = "cn=admin,".$basedn;
$dbDefaults{'rootpw'} = "";
$dbDefaults{'rootpw_clear'} = "";
@@ -980,7 +981,7 @@
my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} );
my $database = { 'type' => 'hdb',
- 'suffix' => $dbDefaults{'basedn'},
+ 'suffix' => $dbDefaults{'suffix'},
'rootdn' => $dbDefaults{'rootdn'},
'rootpw' => $pwHash,
'directory' => '/var/lib/ldap',
@@ -1038,7 +1039,7 @@
$self->ChangeDatabaseIndex(1, $idx );
}
}
- push @added_databases, { suffix => $dbDefaults{'basedn'},
+ push @added_databases, { suffix => $dbDefaults{'suffix'},
rootdn => $dbDefaults{'rootdn'},
rootpw => $dbDefaults{'rootpw_clear'} };
$usingDefaults = 0;
@@ -1202,7 +1203,7 @@
}
-BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "string"], "boolean" ]; }
+BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean" ]; }
sub AddDatabase
{
my ($self, $index, $db, $createDir) = @_;
@@ -1236,6 +1237,8 @@
$self->SetError( $err->{'summary'}, $err->{'description'} );
return 0;
}
+
+ # add some default ACLs
my @acls = ('to dn.subtree="'. $db->{'suffix'} .'" attrs=userPassword by self write by * auth',
# 'to attrs=shadowLastChange by self write by * read',
'to dn.subtree="'. $db->{'suffix'} .'" by * read');
@@ -1249,6 +1252,21 @@
return 0;
}
}
+
+ # add some defaults to DB_CONFIG
+ my $dbconfig = [
+ "set_cachesize 0 15000000 1",
+ "set_lg_regionmax 262144",
+ "set_lg_bsize 2097152",
+ "set_flags DB_LOG_AUTOREMOVE"
+ ];
+ $rc = SCR->Write(".ldapserver.database.{$index}.dbconfig", $dbconfig );
+ if(! $rc ) {
+ my $err = SCR->Error(".ldapserver");
+ y2error("Adding DB_CONFIG failed: ".$err->{'summary'}." ".$err->{'description'});
+ $self->SetError( $err->{'summary'}, $err->{'description'} );
+ return 0;
+ }
return 1;
}
Modified: trunk/ldap-server/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=49887&r1=49886&r2=49887&view=diff
==============================================================================
--- trunk/ldap-server/src/dialogs.ycp (original)
+++ trunk/ldap-server/src/dialogs.ycp Fri Aug 8 17:24:02 2008
@@ -298,157 +298,12 @@
any ProposalDialog()
{
- map defaults = LdapServer::CreateInitialDefaults();
- string enctype = "";
- boolean useCommonCA = false;
- boolean common_ca_available = ( CaMgm::prop_selection == `def || CaMgm::prop_selection == `floppy || CaMgm::prop_selection == `expert );
-
- if( !common_ca_available )
+ symbol ret = LdapDatabase::AddDbBasic(true);
+ if ( ret == `next )
{
- useCommonCA = false;
+ LdapServer::SetInitialDefaults(LdapDatabase::GetDatabase());
}
- boolean append_checked = true;
-
- if( defaults["rootdn"]:"" != "" )
- {
- integer pos = search( defaults["rootdn"]:"", defaults["basedn"]:"" );
- if( pos > -1 )
- {
- defaults["rootdn"] = substring( defaults["rootdn"]:"", 0, pos-1 );
- } else
- {
- append_checked = false;
- }
- }
-
- list enc_types = [
- `item( `id( "CRYPT"), "CRYPT", enctype == "CRYPT" ),
- `item( `id( "SMD5" ), "SMD5", enctype == "SMD5" ),
- `item( `id( "SHA" ), "SHA", enctype == "SHA" ),
- `item( `id( "SSHA" ), "SSHA", enctype == "SSHA" ),
- `item( `id( "PLAIN" ), "PLAIN", enctype == "PLAIN" )
- ];
-
- term dlg_propose =
- `VBox(
- `Heading( _("Database Settings") ),
- `HSquash(
- `VBox (
- `Left(
- `InputField(`id( `te_basedn), `opt(`hstretch) , _("&Base DN"), defaults["basedn"]:"" )
- ),
- `VSpacing(0.5),
- `Left(
- `VSquash(
- `HBox(
- `InputField( `id( `te_rootdn ), _("&Administrator DN"), defaults["rootdn"]:"" ),
- `HSpacing(),
- `VBox(
- `Bottom(
- `CheckBox( `id( `cb_append_basedn ), _("A&ppend Base DN"), append_checked )
- ),
- `VSpacing( 0.3 )
- )
- )
- )
- ),
- `VSpacing(0.5),
- `Left(
- `Password( `id( `te_rootpw ), `opt(`hstretch), _("LDAP Administrator &Password"), defaults["rootpw"]:"" )
- ),
- `Left(
- `Password( `id( `te_valid_rootpw ), `opt(`hstretch), _("&Validate Password"), defaults["rootpw"]:"" )
- ),
- `Left(
- `ComboBox( `id( `cmb_cryptmethod ), _("Password &Encryption"), enc_types )
- )
- )
- )
- );
-
- Wizard::SetContentsButtons( caption, dlg_propose, HELPS["propose"]:"<p><b>no proposal help text</b></p>",
- Label::BackButton(), Label::NextButton() );
-
- if ( ! (boolean)defaults["serviceEnabled"]:false )
- {
- UI::ChangeWidget( `id( `te_basedn ), `Enabled, false );
- UI::ChangeWidget( `id( `te_rootdn ), `Enabled, false );
- UI::ChangeWidget( `id( `cb_append_basedn ), `Enabled, false );
- UI::ChangeWidget( `id( `te_rootpw ), `Enabled, false );
- UI::ChangeWidget( `id( `te_valid_rootpw ), `Enabled, false );
- UI::ChangeWidget( `id( `cmb_cryptmethod ), `Enabled, false );
- }
-
- any ret = nil;
- map event = $[];
- while( true )
- {
- event = UI::WaitForEvent ();
- ret = event["ID"]:nil;
- y2milestone( "ProposeDialog: seeing return value %1", ret );
- if( ret == `back || ret == `abort || ret == `cancel )
- {
- break;
- }
- else if( ret == `next )
- {
- //validate/update rootpw
- defaults["rootpw_clear"] = (string)UI::QueryWidget( `id( `te_rootpw ), `Value );
- if ( defaults["rootpw_clear"]:"" == "" )
- {
- Popup::Error( _("Please enter a password for the Administrator user") );
- continue;
- }
- if( defaults["rootpw_clear"]:"" != "" )
- {
- if( defaults["rootpw_clear"]:"" != UI::QueryWidget( `id( `te_valid_rootpw ), `Value ) )
- {
- /* error popup */
- Popup::Error( _("Password validation failed.") );
- defaults["rootpw_clear"] = "";
- continue;
- }
- }
- //update enctype
- string enctype = (string)UI::QueryWidget( `id( `cmb_cryptmethod ), `Value );
- y2debug( "changing enctype to %1", enctype );
- defaults["pwenctype"] = enctype;
-
- //update Base DN
- defaults["basedn"] = (string)UI::QueryWidget( `id( `te_basedn ), `Value );
- y2debug( "changing baseDN to %1", defaults["basedn"]:"" );
-
- //update rootDN
- defaults["rootdn"] = (string)UI::QueryWidget( `id( `te_rootdn ), `Value );
- if( (boolean)UI::QueryWidget( `id( `cb_append_basedn ), `Value ) )
- {
- defaults["rootdn"] = defaults["rootdn"]:"" + "," + defaults["basedn"]:"";
- }
- LdapServer::SetInitialDefaults(defaults);
- break;
- } else if( ret == `rb_enable )
- {
- y2debug( "enable server clicked" );
- //enable widgets
- UI::ChangeWidget( `id( `te_basedn ), `Enabled, true );
- UI::ChangeWidget( `id( `te_rootdn ), `Enabled, true );
- UI::ChangeWidget( `id( `cb_append_basedn ), `Enabled, true );
- UI::ChangeWidget( `id( `te_rootpw ), `Enabled, true );
- UI::ChangeWidget( `id( `te_valid_rootpw ), `Enabled, true );
- UI::ChangeWidget( `id( `cmb_cryptmethod ), `Enabled, true );
- } else if ( ret == `rb_disable )
- {
- y2debug( "disable server clicked" );
- //disable widgets
- UI::ChangeWidget( `id( `te_basedn ), `Enabled, false );
- UI::ChangeWidget( `id( `te_rootdn ), `Enabled, false );
- UI::ChangeWidget( `id( `cb_append_basedn ), `Enabled, false );
- UI::ChangeWidget( `id( `te_rootpw ), `Enabled, false );
- UI::ChangeWidget( `id( `te_valid_rootpw ), `Enabled, false );
- UI::ChangeWidget( `id( `cmb_cryptmethod ), `Enabled, false );
- }
- }
return ret;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
