author | kergoth <kergoth> | 2003-08-09 17:42:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:42:14 (UTC) |
commit | 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 (patch) (side-by-side diff) | |
tree | 644d196b01c7f280981bd17da23c7592a18e5643 /core/settings/security | |
parent | ec14206f63dd93e9fb84c76cbc76fc1968637590 (diff) | |
download | opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.zip opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.tar.gz opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.tar.bz2 |
Merge from BRANCH_1_0
-rw-r--r-- | core/settings/security/security.cpp | 258 | ||||
-rw-r--r-- | core/settings/security/security.h | 6 | ||||
-rw-r--r-- | core/settings/security/securitybase.ui | 465 |
3 files changed, 502 insertions, 227 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 4701506..75a181b 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -1,23 +1,24 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. -** -** This file is part of Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ + ** Copyright (C) 2000 Trolltech AS. All rights reserved. + ** + ** This file is part of Qtopia Environment. + ** + ** This file may be distributed and/or modified under the terms of the + ** GNU General Public License version 2 as published by the Free Software + ** Foundation and appearing in the file LICENSE.GPL included in the + ** packaging of this file. + ** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** + ** See http://www.trolltech.com/gpl/ for GPL licensing information. + ** + ** Contact info@trolltech.com if any conditions of this licensing are + ** not clear to you. + ** + **********************************************************************/ #include "security.h" +#include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/password.h> @@ -28,7 +29,10 @@ #include <qcombobox.h> #include <qmessagebox.h> +#include <qfile.h> +#include <qlistview.h> +#include <qtextstream.h> -Security::Security( QWidget* parent, const char* name, WFlags fl ) - : SecurityBase( parent, name, TRUE, fl ) + Security::Security( QWidget* parent, const char* name, WFlags fl ) +: SecurityBase( parent, name, TRUE, fl ) { valid=FALSE; @@ -42,21 +46,38 @@ Security::Security( QWidget* parent, const char* name, WFlags fl ) selectNet(auth_peer,auth_peer_bits); connect(syncnet, SIGNAL(textChanged(const QString&)), - this, SLOT(setSyncNet(const QString&))); + this, SLOT(setSyncNet(const QString&))); /* - cfg.setGroup("Remote"); - if ( telnetAvailable() ) - telnet->setChecked(cfg.readEntry("allow_telnet")); - else - telnet->hide(); - - if ( sshAvailable() ) - ssh->setChecked(cfg.readEntry("allow_ssh")); - else - ssh->hide(); - */ + cfg.setGroup("Remote"); + if ( telnetAvailable() ) + telnet->setChecked(cfg.readEntry("allow_telnet")); + else + telnet->hide(); + if ( sshAvailable() ) + ssh->setChecked(cfg.readEntry("allow_ssh")); + else + ssh->hide(); + */ + + QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; + Config loginCfg(configFile,Config::File); + + loginCfg.setGroup("General"); + autoLoginName=loginCfg.readEntry("AutoLogin",""); + + if (autoLoginName.stripWhiteSpace().isEmpty()) { + autoLogin=false; + } else { + autoLogin=true; + } + + + 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())); + + loadUsers(); updateGUI(); @@ -75,7 +96,11 @@ void Security::updateGUI() changepasscode->setText( empty ? tr("Set passcode" ) - : tr("Change passcode" ) ); + : tr("Change passcode" ) ); passcode_poweron->setEnabled( !empty ); clearpasscode->setEnabled( !empty ); + + autologinToggle->setChecked(autoLogin); + userlist->setEnabled(autoLogin); + } @@ -87,16 +112,16 @@ void Security::show() SecurityBase::show(); if ( passcode.isEmpty() ) { - // could insist... - //changePassCode(); - //if ( passcode.isEmpty() ) - //reject(); + // could insist... + //changePassCode(); + //if ( passcode.isEmpty() ) + //reject(); } else { - QString pc = enterPassCode(tr("Enter passcode")); - if ( pc != passcode ) { - QMessageBox::critical(this, tr("Passcode incorrect"), - tr("The passcode entered is incorrect.\nAccess denied")); - reject(); - return; - } + QString pc = enterPassCode(tr("Enter passcode")); + if ( pc != passcode ) { + QMessageBox::critical(this, tr("Passcode incorrect"), + tr("The passcode entered is incorrect.\nAccess denied")); + reject(); + return; + } } setEnabled(TRUE); @@ -120,20 +145,20 @@ void Security::selectNet(int auth_peer,int auth_peer_bits) QString sn; if ( auth_peer_bits == 0 && auth_peer == 0 ) { - sn = tr("Any"); + sn = tr("Any"); } else if ( auth_peer_bits == 32 && auth_peer == 0 ) { - sn = tr("None"); + sn = tr("None"); } else { - sn = - QString::number((auth_peer>>24)&0xff) + "." - + QString::number((auth_peer>>16)&0xff) + "." - + QString::number((auth_peer>>8)&0xff) + "." - + QString::number((auth_peer>>0)&0xff) + "/" - + QString::number(auth_peer_bits); + sn = + QString::number((auth_peer>>24)&0xff) + "." + + QString::number((auth_peer>>16)&0xff) + "." + + QString::number((auth_peer>>8)&0xff) + "." + + QString::number((auth_peer>>0)&0xff) + "/" + + QString::number(auth_peer_bits); } for (int i=0; i<syncnet->count(); i++) { - if ( syncnet->text(i).left(sn.length()) == sn ) { - syncnet->setCurrentItem(i); - return; - } + if ( syncnet->text(i).left(sn.length()) == sn ) { + syncnet->setCurrentItem(i); + return; + } } qDebug("No match for \"%s\"",sn.latin1()); @@ -144,21 +169,51 @@ void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits) auth_peer=0; if ( sn == tr("Any") ) { - auth_peer = 0; - auth_peer_bits = 0; + auth_peer = 0; + auth_peer_bits = 0; } else if ( sn == tr("None") ) { - auth_peer = 0; - auth_peer_bits = 32; + auth_peer = 0; + auth_peer_bits = 32; } else { - int x=0; - for (int i=0; i<4; i++) { - int nx = sn.find(QChar(i==3 ? '/' : '.'),x); - auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt(); - x = nx+1; - } - uint n = (uint)sn.find(' ',x)-x; - auth_peer_bits = sn.mid(x,n).toInt(); + int x=0; + for (int i=0; i<4; i++) { + int nx = sn.find(QChar(i==3 ? '/' : '.'),x); + auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt(); + x = nx+1; + } + uint n = (uint)sn.find(' ',x)-x; + auth_peer_bits = sn.mid(x,n).toInt(); } } +void Security::loadUsers ( void ) +{ + QFile passwd("/etc/passwd"); + if ( passwd.open(IO_ReadOnly) ) { + QTextStream t( &passwd ); + QString s; + QStringList account; + while ( !t.eof() ) { + account = QStringList::split(':',t.readLine()); + + // Hide disabled accounts + if (*account.at(1)!="*") { + + userlist->insertItem(*account.at(0)); + // Highlight this item if it is set to autologinToggle + if ( *account.at(0) == autoLoginName) + userlist->setCurrentItem(userlist->count()-1); + } + } + passwd.close(); + } + +} +void Security::toggleAutoLogin(bool val) +{ + autoLogin=val; + userlist->setEnabled(val); + if (!autoLogin) + autoLoginName=userlist->currentText(); +} void Security::setSyncNet(const QString& sn) { @@ -171,26 +226,43 @@ void Security::applySecurity() { if ( valid ) { - Config cfg("Security"); - cfg.setGroup("Passcode"); - cfg.writeEntry("passcode",passcode); - cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); - cfg.setGroup("Sync"); - int auth_peer=0; - int auth_peer_bits; - QString sn = syncnet->currentText(); - parseNet(sn,auth_peer,auth_peer_bits); - cfg.writeEntry("auth_peer",auth_peer); - cfg.writeEntry("auth_peer_bits",auth_peer_bits); - /* - cfg.setGroup("Remote"); - if ( telnetAvailable() ) - cfg.writeEntry("allow_telnet",telnet->isChecked()); - if ( sshAvailable() ) - cfg.writeEntry("allow_ssh",ssh->isChecked()); - // ### write ssh/telnet sys config files - */ + Config cfg("Security"); + cfg.setGroup("Passcode"); + cfg.writeEntry("passcode",passcode); + cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); + cfg.setGroup("Sync"); + int auth_peer=0; + int auth_peer_bits; + QString sn = syncnet->currentText(); + parseNet(sn,auth_peer,auth_peer_bits); + cfg.writeEntry("auth_peer",auth_peer); + cfg.writeEntry("auth_peer_bits",auth_peer_bits); + /* + cfg.setGroup("Remote"); + if ( telnetAvailable() ) + cfg.writeEntry("allow_telnet",telnet->isChecked()); + if ( sshAvailable() ) + cfg.writeEntry("allow_ssh",ssh->isChecked()); + // ### write ssh/telnet sys config files + */ + + QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; + Config loginCfg(configFile,Config::File); + loginCfg.setGroup("General"); + + if (autoLogin) { + loginCfg.writeEntry("AutoLogin",autoLoginName); + } else { + loginCfg.removeEntry("AutoLogin"); + } + } } +void Security::changeLoginName( int idx ) +{ + autoLoginName = userlist->text(idx);; + updateGUI(); +} + void Security::changePassCode() { @@ -199,10 +271,10 @@ void Security::changePassCode() do { - new1 = enterPassCode(tr("Enter new passcode")); - if ( new1.isNull() ) - return; - new2 = enterPassCode(tr("Re-enter new passcode")); - if ( new2.isNull() ) - return; + new1 = enterPassCode(tr("Enter new passcode")); + if ( new1.isNull() ) + return; + new2 = enterPassCode(tr("Re-enter new passcode")); + if ( new2.isNull() ) + return; } while (new1 != new2); diff --git a/core/settings/security/security.h b/core/settings/security/security.h index efc83a2..2f18f91 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h @@ -44,6 +44,10 @@ private slots: void clearPassCode(); void setSyncNet(const QString&); + void changeLoginName(int); + void toggleAutoLogin(bool); + private: + void loadUsers(void); bool telnetAvailable() const; bool sshAvailable() const; @@ -56,4 +60,6 @@ private: QString passcode; bool valid; + bool autoLogin; + QString autoLoginName; QPEDialogListener *dl; diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index c2a8953..da25f39 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>277</width> - <height>328</height> + <width>329</width> + <height>483</height> </rect> </property> @@ -26,72 +26,248 @@ <name>layoutSpacing</name> </property> - <grid> + <vbox> <property stdset="1"> <name>margin</name> - <number>3</number> + <number>0</number> </property> <property stdset="1"> <name>spacing</name> - <number>3</number> + <number>0</number> </property> - <widget row="0" column="0" > - <class>QLayoutWidget</class> + <widget> + <class>QTabWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout1</cstring> + <cstring>TabWidget2</cstring> </property> <property> - <name>layoutSpacing</name> + <name>layoutMargin</name> </property> - <hbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> + <widget> + <class>QWidget</class> <property stdset="1"> - <name>spacing</name> - <number>-1</number> + <name>name</name> + <cstring>tab</cstring> </property> - <widget> - <class>QPushButton</class> + <attribute> + <name>title</name> + <string>Passcode</string> + </attribute> + <vbox> <property stdset="1"> - <name>name</name> - <cstring>changepasscode</cstring> + <name>margin</name> + <number>6</number> </property> <property stdset="1"> - <name>text</name> - <string>Change passcode</string> + <name>spacing</name> + <number>6</number> </property> - </widget> - <widget> - <class>QPushButton</class> + <widget> + <class>QGroupBox</class> + <property stdset="1"> + <name>name</name> + <cstring>GroupBox4</cstring> + </property> + <property stdset="1"> + <name>title</name> + <string>Passcode</string> + </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>11</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout1</cstring> + </property> + <property> + <name>layoutSpacing</name> + </property> + <hbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>-1</number> + </property> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>changepasscode</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Change passcode</string> + </property> + </widget> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>clearpasscode</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Clear passcode</string> + </property> + </widget> + </hbox> + </widget> + <widget> + <class>QCheckBox</class> + <property stdset="1"> + <name>name</name> + <cstring>passcode_poweron</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Require pass code at power-on</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1</cstring> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>7</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> + <name>text</name> + <string><P>Pass code protection provides a minimal level of protection from casual access to this device.</string> + </property> + <property stdset="1"> + <name>textFormat</name> + <enum>RichText</enum> + </property> + <property stdset="1"> + <name>alignment</name> + <set>AlignTop|AlignLeft</set> + </property> + <property> + <name>vAlign</name> + </property> + </widget> + </vbox> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer3</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> + </widget> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>tab</cstring> + </property> + <attribute> + <name>title</name> + <string>Login</string> + </attribute> + <vbox> <property stdset="1"> - <name>name</name> - <cstring>clearpasscode</cstring> + <name>margin</name> + <number>6</number> </property> <property stdset="1"> - <name>text</name> - <string>Clear passcode</string> + <name>spacing</name> + <number>6</number> </property> - </widget> - </hbox> - </widget> - <widget row="1" column="0" > - <class>QCheckBox</class> - <property stdset="1"> - <name>name</name> - <cstring>passcode_poweron</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Require pass code at power-on</string> - </property> - </widget> - <widget row="3" column="0" > - <class>QTabWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>TabWidget2</cstring> - </property> + <widget> + <class>QGroupBox</class> + <property stdset="1"> + <name>name</name> + <cstring>GroupBox3</cstring> + </property> + <property stdset="1"> + <name>title</name> + <string>Login</string> + </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>11</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QCheckBox</class> + <property stdset="1"> + <name>name</name> + <cstring>autologinToggle</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Login Automatically</string> + </property> + </widget> + <widget> + <class>QComboBox</class> + <property stdset="1"> + <name>name</name> + <cstring>userlist</cstring> + </property> + </widget> + </vbox> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer2</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> + </widget> <widget> <class>QWidget</class> @@ -107,5 +283,5 @@ <property stdset="1"> <name>margin</name> - <number>11</number> + <number>6</number> </property> <property stdset="1"> @@ -114,102 +290,123 @@ </property> <widget> - <class>QLabel</class> + <class>QGroupBox</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel1_2</cstring> + <cstring>GroupBox2</cstring> </property> <property stdset="1"> - <name>text</name> - <string>Accept sync from network:</string> + <name>title</name> + <string>Sync</string> </property> - </widget> - <widget> - <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>192.168.129.0/24 (default)</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>192.168.1.0/24</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>192.168.0.0/16</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>172.16.0.0/12</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>10.0.0.0/8</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>1.0.0.0/8</string> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>11</number> </property> - </item> - <item> - <property> - <name>text</name> - <string>Any</string> + <property stdset="1"> + <name>spacing</name> + <number>6</number> </property> - </item> - <item> - <property> - <name>text</name> - <string>None</string> - </property> - </item> - <property stdset="1"> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1_2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Accept sync from network:</string> + </property> + <property stdset="1"> + <name>textFormat</name> + <enum>RichText</enum> + </property> + </widget> + <widget> + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>192.168.129.0/24 (default)</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>192.168.1.0/24</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>192.168.0.0/16</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>172.16.0.0/12</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>10.0.0.0/8</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>1.0.0.0/8</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>Any</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>None</string> + </property> + </item> + <property stdset="1"> + <name>name</name> + <cstring>syncnet</cstring> + </property> + <property stdset="1"> + <name>editable</name> + <bool>true</bool> + </property> + </widget> + </vbox> + </widget> + <spacer> + <property> <name>name</name> - <cstring>syncnet</cstring> + <cstring>Spacer1</cstring> </property> <property stdset="1"> - <name>editable</name> - <bool>true</bool> + <name>orientation</name> + <enum>Vertical</enum> </property> - </widget> + <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> </widget> </widget> - <widget row="2" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>7</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>text</name> - <string><P>Pass code protection provides a minimal level of protection from casual access to this device.</string> - </property> - <property stdset="1"> - <name>alignment</name> - <set>AlignTop|AlignLeft</set> - </property> - <property> - <name>vAlign</name> - </property> - </widget> - </grid> + </vbox> </widget> </UI> |