author | coredump <coredump> | 2003-11-27 12:26:07 (UTC) |
---|---|---|
committer | coredump <coredump> | 2003-11-27 12:26:07 (UTC) |
commit | 51ca35ecb7e22fc564ffe62184d4a75aa8537b1d (patch) (side-by-side diff) | |
tree | 49bffaeeec6e8dba3b5d2dd5614ef77d50045c9e /core | |
parent | afe4e5bcfdd3d67166cdbf28f4514783ada1d290 (diff) | |
download | opie-51ca35ecb7e22fc564ffe62184d4a75aa8537b1d.zip opie-51ca35ecb7e22fc564ffe62184d4a75aa8537b1d.tar.gz opie-51ca35ecb7e22fc564ffe62184d4a75aa8537b1d.tar.bz2 |
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
-rw-r--r-- | core/settings/security/security.cpp | 98 | ||||
-rw-r--r-- | core/settings/security/security.h | 7 | ||||
-rw-r--r-- | core/settings/security/securitybase.ui | 186 |
3 files changed, 219 insertions, 72 deletions
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 <qtextstream.h> 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; i<syncapp->count(); i++) { if ( syncapp->text(i) == sa ) { syncapp->setCurrentItem(i); @@ -87,11 +87,17 @@ 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( "<p>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; i<syncnet->count(); i++) { + if ( syncnet->text(i) == netrange ) { + already_there=TRUE; + } + } + if (! already_there) { + syncnet->insertItem( tr( netrange ) ); + } else { + already_there=FALSE; + } + } + } + } + } + for (int i=0; i<syncnet->count(); 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); + + //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 @@ <rect> <x>0</x> <y>0</y> - <width>321</width> + <width>309</width> <height>483</height> </rect> </property> @@ -109,6 +109,12 @@ <name>text</name> <string>Change passcode</string> </property> + <property> + <name>whatsThis</name> + <string>This button will let you change the security passcode. + +Note: This is *not* the sync password.</string> + </property> </widget> <widget> <class>QPushButton</class> @@ -120,6 +126,11 @@ <name>text</name> <string>Clear passcode</string> </property> + <property> + <name>whatsThis</name> + <string>Delete the current passcode. +You can enter a new one at any time.</string> + </property> </widget> </hbox> </widget> @@ -133,6 +144,10 @@ <name>text</name> <string>Require pass code at power-on</string> </property> + <property> + <name>whatsThis</name> + <string>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</string> + </property> </widget> <widget> <class>QLabel</class> @@ -236,6 +251,12 @@ <name>text</name> <string>Login Automatically</string> </property> + <property> + <name>whatsThis</name> + <string>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".</string> + </property> </widget> <widget> <class>QComboBox</class> @@ -243,6 +264,13 @@ <name>name</name> <cstring>userlist</cstring> </property> + <property> + <name>whatsThis</name> + <string>This drop-down list allows you to select the user for auto-login +(if enabled above). + +You can only select an actually configured user.</string> + </property> </widget> </vbox> </widget> @@ -279,7 +307,7 @@ <name>title</name> <string>Sync</string> </attribute> - <vbox> + <grid> <property stdset="1"> <name>margin</name> <number>11</number> @@ -288,7 +316,28 @@ <name>spacing</name> <number>6</number> </property> - <widget> + <spacer row="1" column="0" > + <property> + <name>name</name> + <cstring>Spacer1</cstring> + </property> + <property stdset="1"> + <name>orientation</name> + <enum>Vertical</enum> + </property> + <property stdset="1"> + <name>sizeType</name> + <enum>Expanding</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget row="0" column="0" > <class>QGroupBox</class> <property stdset="1"> <name>name</name> @@ -324,63 +373,83 @@ </widget> <widget> <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>192.168.129.0/24 (default)</string> + <property stdset="1"> + <name>name</name> + <cstring>syncnet</cstring> </property> - </item> - <item> - <property> - <name>text</name> - <string>192.168.1.0/24</string> + <property stdset="1"> + <name>editable</name> + <bool>true</bool> </property> - </item> - <item> <property> - <name>text</name> - <string>192.168.0.0/16</string> + <name>whatsThis</name> + <string>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".</string> </property> - </item> - <item> - <property> - <name>text</name> - <string>172.16.0.0/12</string> + </widget> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout4</cstring> </property> - </item> - <item> - <property> - <name>text</name> - <string>10.0.0.0/8</string> + <hbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> </property> - </item> - <item> - <property> - <name>text</name> - <string>1.0.0.0/8</string> + <property stdset="1"> + <name>spacing</name> + <number>6</number> </property> - </item> - <item> - <property> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>deleteentry</cstring> + </property> + <property stdset="1"> <name>text</name> - <string>Any</string> + <string>Delete Entry</string> </property> - </item> - <item> <property> - <name>text</name> - <string>None</string> + <name>whatsThis</name> + <string>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.</string> </property> - </item> + </widget> + <widget> + <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>syncnet</cstring> + <cstring>restoredefaults</cstring> </property> <property stdset="1"> - <name>editable</name> - <bool>true</bool> + <name>text</name> + <string>Restore Defaults</string> + </property> + <property> + <name>whatsThis</name> + <string>This button will restore the list of net ranges +to the defaults. + +Beware that all manually entered net ranges will be lost!</string> </property> </widget> + </hbox> + </widget> <widget> <class>QLabel</class> <property stdset="1"> @@ -410,6 +479,14 @@ <name>name</name> <cstring>syncapp</cstring> </property> + <property> + <name>whatsThis</name> + <string>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.</string> + </property> </widget> <widget> <class>QComboBox</class> @@ -438,28 +515,7 @@ </widget> </vbox> </widget> - <spacer> - <property> - <name>name</name> - <cstring>Spacer1</cstring> - </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> - </property> - <property stdset="1"> - <name>sizeType</name> - <enum>Expanding</enum> - </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </vbox> + </grid> </widget> </widget> </vbox> |