-rw-r--r-- | core/launcher/qcopbridge.cpp | 2 | ||||
-rw-r--r-- | core/launcher/qcopbridge.h | 3 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 28 |
3 files changed, 26 insertions, 7 deletions
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp index b45f0cc..9bca360 100644 --- a/core/launcher/qcopbridge.cpp +++ b/core/launcher/qcopbridge.cpp | |||
@@ -156,25 +156,25 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &data | |||
156 | // we need to buffer it a bit | 156 | // we need to buffer it a bit |
157 | sendSync = TRUE; | 157 | sendSync = TRUE; |
158 | startTimer( 20000 ); | 158 | startTimer( 20000 ); |
159 | } | 159 | } |
160 | 160 | ||
161 | if ( m_mode & Qtopia1_7 ) { | 161 | if ( m_mode & Qtopia1_7 ) { |
162 | // send the command to all open connections | 162 | // send the command to all open connections |
163 | QCopBridgePI *pi; | 163 | QCopBridgePI *pi; |
164 | for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() ) { | 164 | for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() ) { |
165 | pi->sendDesktopMessage( command, data ); | 165 | pi->sendDesktopMessage( command, data ); |
166 | } | 166 | } |
167 | } | 167 | } |
168 | if ( m_mode & Sharp ) | 168 | if ( ( m_mode & Sharp ) || (m_mode & IntelliSync) ) |
169 | sendDesktopMessageOld( command, data ); | 169 | sendDesktopMessageOld( command, data ); |
170 | } | 170 | } |
171 | 171 | ||
172 | #ifndef OPIE_NO_OLD_SYNC_CODE | 172 | #ifndef OPIE_NO_OLD_SYNC_CODE |
173 | /* | 173 | /* |
174 | * Old compat mode | 174 | * Old compat mode |
175 | */ | 175 | */ |
176 | void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArray& args) { | 176 | void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArray& args) { |
177 | command.stripWhiteSpace(); | 177 | command.stripWhiteSpace(); |
178 | 178 | ||
179 | int paren = command.find( "(" ); | 179 | int paren = command.find( "(" ); |
180 | if ( paren <= 0 ) { | 180 | if ( paren <= 0 ) { |
diff --git a/core/launcher/qcopbridge.h b/core/launcher/qcopbridge.h index 9483d9d..d5988cd 100644 --- a/core/launcher/qcopbridge.h +++ b/core/launcher/qcopbridge.h | |||
@@ -28,25 +28,26 @@ | |||
28 | #include <qbuffer.h> | 28 | #include <qbuffer.h> |
29 | 29 | ||
30 | class QFileInfo; | 30 | class QFileInfo; |
31 | class QCopBridgePI; | 31 | class QCopBridgePI; |
32 | class QCopChannel; | 32 | class QCopChannel; |
33 | class QTimer; | 33 | class QTimer; |
34 | 34 | ||
35 | class QCopBridge : public QServerSocket | 35 | class QCopBridge : public QServerSocket |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | 38 | ||
39 | public: | 39 | public: |
40 | enum Mode { Qtopia1_7= 0x01, Sharp = 0x02, Both = Qtopia1_7 | Sharp }; | 40 | /* can not or anymore :) */ |
41 | enum Mode { Qtopia1_7= 0x01, Sharp = 0x02, IntelliSync = 0x04 }; | ||
41 | QCopBridge( Q_UINT16 port, QObject *parent = 0, const char* name = 0 ); | 42 | QCopBridge( Q_UINT16 port, QObject *parent = 0, const char* name = 0 ); |
42 | virtual ~QCopBridge(); | 43 | virtual ~QCopBridge(); |
43 | 44 | ||
44 | void newConnection( int socket ); | 45 | void newConnection( int socket ); |
45 | void closeOpenConnections(); | 46 | void closeOpenConnections(); |
46 | void authorizeConnections(); | 47 | void authorizeConnections(); |
47 | 48 | ||
48 | public slots: | 49 | public slots: |
49 | void closed( QCopBridgePI *pi ); | 50 | void closed( QCopBridgePI *pi ); |
50 | void desktopMessage( const QCString &call, const QByteArray & ); | 51 | void desktopMessage( const QCString &call, const QByteArray & ); |
51 | 52 | ||
52 | signals: | 53 | signals: |
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 9cb9d7a..8367a62 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -185,33 +185,51 @@ bool SyncAuthentication::checkPassword( const QString& password ) | |||
185 | 185 | ||
186 | // Note: some systems use more than crypt for passwords. | 186 | // Note: some systems use more than crypt for passwords. |
187 | QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) ); | 187 | QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) ); |
188 | if ( cpwd == cpassword ) | 188 | if ( cpwd == cpassword ) |
189 | return TRUE; | 189 | return TRUE; |
190 | #endif | 190 | #endif |
191 | 191 | ||
192 | static int lastdenial=0; | 192 | static int lastdenial=0; |
193 | static int denials=0; | 193 | static int denials=0; |
194 | int now = time(0); | 194 | int now = time(0); |
195 | 195 | ||
196 | Config cfg("Security"); | 196 | Config cfg("Security"); |
197 | cfg.setGroup("Sync"); | 197 | cfg.setGroup("SyncMode"); |
198 | QString syncapp = cfg.readEntry("syncapp","Qtopia"); | 198 | int mode = cfg.readNumEntry("Mode", 0x02 ); |
199 | 199 | ||
200 | //No password needed if the user really wants it | 200 | //No pass word needed if the user really needs it |
201 | if (syncapp == "IntelliSync") { | 201 | if (mode & 0x04) { |
202 | QMessageBox unauth( | ||
203 | tr("Sync Connection"), | ||
204 | tr("<qt><p>An unauthorized system is requesting access to this device." | ||
205 | "<p>You chose IntelliSync so you may I allow or deny this connection.</qt>" ), | ||
206 | QMessageBox::Warning, | ||
207 | QMessageBox::Ok, QMessageBox::Cancel|QMessageBox::Default, QMessageBox::NoButton, | ||
208 | 0, QString::null, TRUE, WStyle_StaysOnTop); | ||
209 | unauth.setButtonText(QMessageBox::Ok, tr("Allow" ) ); | ||
210 | unauth.setButtonText(QMessageBox::Cancel, tr("Deny")); | ||
211 | switch( unauth.exec() ) { | ||
212 | case QMessageBox::Ok: | ||
202 | return TRUE; | 213 | return TRUE; |
214 | break; | ||
215 | case QMessageBox::Cancel: | ||
216 | default: | ||
217 | denials++; | ||
218 | lastdenial=now; | ||
219 | return FALSE; | ||
220 | } | ||
203 | } | 221 | } |
204 | 222 | ||
205 | // Detect old Qtopia Desktop (no password) | 223 | // Detect old Qtopia Desktop (no password) and fail |
206 | if ( password.isEmpty() ) { | 224 | if ( password.isEmpty() ) { |
207 | if ( denials < 3 || now > lastdenial+600 ) { | 225 | if ( denials < 3 || now > lastdenial+600 ) { |
208 | QMessageBox unauth( | 226 | QMessageBox unauth( |
209 | tr("Sync Connection"), | 227 | tr("Sync Connection"), |
210 | tr("<p>An unauthorized system is requesting access to this device." | 228 | tr("<p>An unauthorized system is requesting access to this device." |
211 | "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " | 229 | "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " |
212 | "please upgrade or change the security setting to use IntelliSync." ), | 230 | "please upgrade or change the security setting to use IntelliSync." ), |
213 | QMessageBox::Warning, | 231 | QMessageBox::Warning, |
214 | QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, | 232 | QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, |
215 | 0, QString::null, TRUE, WStyle_StaysOnTop); | 233 | 0, QString::null, TRUE, WStyle_StaysOnTop); |
216 | unauth.setButtonText(QMessageBox::Cancel, tr("Deny")); | 234 | unauth.setButtonText(QMessageBox::Cancel, tr("Deny")); |
217 | unauth.exec(); | 235 | unauth.exec(); |