From 51ca35ecb7e22fc564ffe62184d4a75aa8537b1d Mon Sep 17 00:00:00 2001 From: coredump Date: Thu, 27 Nov 2003 12:26:07 +0000 Subject: Added: Default net-ranges are no longer hard-coded and can be edited Bugfix: Show user-defined net-range upon application restart in drop-down list --- diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 1b90121..d7871b3 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -34,7 +34,7 @@ #include Security::Security( QWidget* parent, const char* name, WFlags fl ) -: SecurityBase( parent, name, TRUE, fl ) +: SecurityBase( parent, name, TRUE, WStyle_ContextHelp ) { valid=FALSE; Config cfg("Security"); @@ -44,14 +44,14 @@ cfg.setGroup("Sync"); int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24 int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); - selectNet(auth_peer,auth_peer_bits); + selectNet(auth_peer,auth_peer_bits,TRUE); + connect(syncnet, SIGNAL(textChanged(const QString&)), this, SLOT(setSyncNet(const QString&))); cfg.setGroup("Sync"); QString sa = cfg.readEntry("syncapp","Qtopia"); - //There must be a better way to do that... for (int i=0; icount(); i++) { if ( syncapp->text(i) == sa ) { syncapp->setCurrentItem(i); @@ -86,12 +86,18 @@ cfg.setGroup("SyncMode"); int mode = cfg.readNumEntry("Mode",2); // Default to Sharp syncModeCombo->setCurrentItem( mode - 1 ); + + //since nobody knows what this is and it doesn't do anything, i'll hide it # CoreDump + // is this work-in-progress or can it be removed? + syncModeCombo->hide(); connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool))); connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int))); connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode())); connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp())); + connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); + connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry())); loadUsers(); updateGUI(); @@ -104,6 +110,40 @@ Security::~Security() { } +void Security::deleteListEntry() +{ + syncnet->removeItem(syncnet->currentItem()); +} + +void Security::restoreDefaults() +{ + QMessageBox unrecbox( + tr("Attention"), + tr( "

All user-defined net ranges will be lost."), + QMessageBox::Warning, + QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, + 0, QString::null, TRUE, WStyle_StaysOnTop); + unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); + unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); + + if ( unrecbox.exec() == QMessageBox::Yes) + { + syncnet->clear(); + insertDefaultRanges(); + } +} + +void Security::insertDefaultRanges() +{ + syncnet->insertItem( tr( "192.168.129.0/24" ) ); + syncnet->insertItem( tr( "192.168.1.0/24" ) ); + syncnet->insertItem( tr( "192.168.0.0/16" ) ); + syncnet->insertItem( tr( "172.16.0.0/12" ) ); + syncnet->insertItem( tr( "10.0.0.0/8" ) ); + syncnet->insertItem( tr( "1.0.0.0/8" ) ); + syncnet->insertItem( tr( "Any" ) ); + syncnet->insertItem( tr( "None" ) ); +} void Security::updateGUI() { @@ -158,7 +198,7 @@ void Security::done(int r) close(); } -void Security::selectNet(int auth_peer,int auth_peer_bits) +void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) { QString sn; if ( auth_peer_bits == 0 && auth_peer == 0 ) { @@ -173,6 +213,44 @@ void Security::selectNet(int auth_peer,int auth_peer_bits) + QString::number((auth_peer>>0)&0xff) + "/" + QString::number(auth_peer_bits); } + + //insert user-defined list of netranges upon start + if (update) { + //User selected/active netrange first + syncnet->insertItem( tr( sn ) ); + + Config cfg("Security"); + cfg.setGroup("Sync"); + + //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe + QString test = cfg.readEntry("net0",""); + if (test.isEmpty()) { + insertDefaultRanges(); + } else { + // 10 ought to be enough for everybody... :) + // If you need more, don't forget to edit applySecurity() as well + bool already_there=FALSE; + for (int i=0; i<10; i++) { + QString target, netrange; + target.sprintf("net%d", i); + netrange = cfg.readEntry(target,""); + if (! netrange.isEmpty()){ + //make sure we have no "twin" entries + for (int i=0; icount(); i++) { + if ( syncnet->text(i) == netrange ) { + already_there=TRUE; + } + } + if (! already_there) { + syncnet->insertItem( tr( netrange ) ); + } else { + already_there=FALSE; + } + } + } + } + } + for (int i=0; icount(); i++) { if ( syncnet->text(i).left(sn.length()) == sn ) { syncnet->setCurrentItem(i); @@ -242,7 +320,7 @@ void Security::setSyncNet(const QString& sn) { int auth_peer,auth_peer_bits; parseNet(sn,auth_peer,auth_peer_bits); - selectNet(auth_peer,auth_peer_bits); + selectNet(auth_peer,auth_peer_bits,FALSE); } void Security::applySecurity() @@ -257,8 +335,18 @@ void Security::applySecurity() int auth_peer_bits; QString sn = syncnet->currentText(); parseNet(sn,auth_peer,auth_peer_bits); + + //this is the *selected* (active) net range cfg.writeEntry("auth_peer",auth_peer); - cfg.writeEntry("auth_peer_bits",auth_peer_bits); + cfg.writeEntry("auth_peer_bits",auth_peer_bits); + + //write back all other net ranges in *cleartext* + for (int i=0; i<10; i++) { + QString target; + target.sprintf("net%d", i); + cfg.writeEntry(target,syncnet->text(i)); + } + cfg.writeEntry("syncapp",syncapp->currentText()); /* diff --git a/core/settings/security/security.h b/core/settings/security/security.h index b1a3eca..72aa352 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h @@ -47,7 +47,9 @@ private slots: void changeLoginName(int); void toggleAutoLogin(bool); void changeSyncApp(); - + void restoreDefaults(); + void insertDefaultRanges(); + void deleteListEntry(); private: void loadUsers(void); @@ -56,7 +58,8 @@ private: void updateGUI(); static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits); - void selectNet(int auth_peer,int auth_peer_bits); + void selectNet(int auth_peer,int auth_peer_bits,bool update); + QString enterPassCode(const QString&); QString passcode; diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 934111e..1769ae1 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui @@ -11,7 +11,7 @@ 0 0 - 321 + 309 483 @@ -109,6 +109,12 @@ text Change passcode + + whatsThis + This button will let you change the security passcode. + +Note: This is *not* the sync password. + QPushButton @@ -120,6 +126,11 @@ text Clear passcode + + whatsThis + Delete the current passcode. +You can enter a new one at any time. + @@ -133,6 +144,10 @@ text Require pass code at power-on + + whatsThis + If you enable this option, a passcode must be entered after every resume event of your Zaurus. + QLabel @@ -236,6 +251,12 @@ text Login Automatically + + whatsThis + If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list. + +For the Zaurus 5x00 this is always the user "root". + QComboBox @@ -243,6 +264,13 @@ name userlist + + whatsThis + This drop-down list allows you to select the user for auto-login +(if enabled above). + +You can only select an actually configured user. + @@ -279,7 +307,7 @@ title Sync - + margin 11 @@ -288,7 +316,28 @@ spacing 6 - + + + name + Spacer1 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + QGroupBox name @@ -324,54 +373,6 @@ QComboBox - - - text - 192.168.129.0/24 (default) - - - - - text - 192.168.1.0/24 - - - - - text - 192.168.0.0/16 - - - - - text - 172.16.0.0/12 - - - - - text - 10.0.0.0/8 - - - - - text - 1.0.0.0/8 - - - - - text - Any - - - - - text - None - - name syncnet @@ -380,6 +381,74 @@ editable true + + whatsThis + Select a net-range or enter a new one. + +This drop-down list lets you select a net range which is allowed to connect to your Zaurus. + +For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus. + +The entry "All" will allow *any* IP to connect. +The entry "None" will *deny* any connection. + +If unsure, select "Any". + + + + QLayoutWidget + + name + Layout4 + + + + margin + 0 + + + spacing + 6 + + + QPushButton + + name + deleteentry + + + text + Delete Entry + + + whatsThis + Delete the selected net range from the list + +If you press this button, the currently selected net range will be deleted from the list of net ranges. + +If you hit this button in error, the button "Restore Defaults" will restore +the list to the state it has been when you initially booted your Zaurus. + + + + QPushButton + + name + restoredefaults + + + text + Restore Defaults + + + whatsThis + This button will restore the list of net ranges +to the defaults. + +Beware that all manually entered net ranges will be lost! + + + QLabel @@ -410,6 +479,14 @@ name syncapp + + whatsThis + This option changes the login behaviour of the internal FTP server. + +If you have problems syncing, try the "IntelliSync" setting, which will accept any password you throw at the sync (FTP) port. + +The default is Qtopia. It will let you log in with username "root" and password "Qtopia". The password is CaSeSeNsItIvE. + QComboBox @@ -438,28 +515,7 @@ - - - name - Spacer1 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - + -- cgit v0.9.0.2