chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
14,082 Commits 4 Branches 173 Tags
v2.7.0-beta1
Commit Graph
14082 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm fb2d31c9ce Folder: Move FolderWatcher to Folder 
This makes it unnecessary for FolderMan to manage the list and removes
the need for some forwarders.

This is done in preparation for follow-up commits that want to add
diagnostics to FolderWatcher that shall be available from within Folder.
 2017-10-24 10:00:20 +02:00
Christian Kamm 8865405a32 Version: master branch is future 2.5 now 2017-10-24 09:56:16 +02:00
Christian Kamm f3ea375083 Wizard: Resolve url/ redirects only if url/status.php not found 
Unfortunately checking the base-url for redirects in all cases lead
to incorrect behavior in some SAML/OAuth2 edge cases.

This new iteration checks the base url for redirects only if the
standard CheckServerJob can't reach the server. That way the 2.3
behavior is only changed in cases that would have lead to errors.

See #5954
 2017-10-24 09:42:08 +02:00
Jenkins for ownCloud 15b02547e8 [tx-robot] updated from transifex 2017-10-24 02:18:49 +02:00
Tomaz Canabrava 476fe66043 [CSE] Add beginnign of the code to deal with the metadata 2017-10-23 21:06:26 +02:00
Tomaz Canabrava bb53c2586f [CSE] Add Nlohmann's json library 
Because nobody deservers to deal with Qt's JSON API
 2017-10-23 21:06:26 +02:00
Tomaz Canabrava 23f5bb7ed9 [CSE] Move network jobs out of networkjobs.h 
Since those networkjobs are all about client side
encryption, mvoe them to clientsideencryption.h
This will help with fewer conflicts with the origin.
 2017-10-23 21:06:26 +02:00
Jenkins for ownCloud 13b1f8b33e [tx-robot] updated from transifex 2017-10-23 02:19:01 +02:00
Jenkins for ownCloud ccd32c04a9 [tx-robot] updated from transifex 2017-10-22 02:21:00 +02:00
Jenkins for ownCloud df19b20d07 [tx-robot] updated from transifex 2017-10-21 02:20:25 +02:00
Olivier Goffart f41c9fbb7f owncloudsetupwizard: Fix "add new account" if the wizard is already visible 
Clicking on the "Add new Account" from the systray menu should raise
the wizard, even if it is already running.

Relates to issue #6105
 2017-10-20 12:41:48 +02:00
Olivier Goffart a0e50670de Shibolleth: raise the browser when clicking on the tray 
Issue #6105

Dynamically find the browser trough topLevelWidgets instead of
forwarding the call to the relevant page as it would require to break
many abstration layers (OwncloudSetupWizard -> OwncloudWizard ->
AbstractCredentialsWizardPage -> OwncloudShibbolethCredsPage)
And considering that we want to phase shibboleth down, I tought is
was not worth adding an interface for this.

The OAuth page don't have this problem because it shows a label and
allow the user to re-open the browser.
 2017-10-20 10:51:35 +02:00
Jenkins for ownCloud 984631d807 [tx-robot] updated from transifex 2017-10-20 02:21:27 +02:00
Olivier Goffart a9761a8976 Use qEnvironmentVariable* instead of qgetenv when appropriate 
Now that we use Qt5, we should do that. It is slightly more efficient
and declares the intent.
(Modified using clazy)
 2017-10-19 13:57:49 +02:00
Jenkins for ownCloud 84d8624e03 [tx-robot] updated from transifex 2017-10-19 02:21:00 +02:00
Tomaz Canabrava 1a47052aa3 [CSE] Remove unused function 
This is already being called from somwhere else.
 2017-10-18 21:51:39 +02:00
Tomaz Canabrava e0988f482c [CSE] Build fix 
- change the name of one Qt Message Handler
- changed parameter from int to QString
 2017-10-18 21:51:39 +02:00
Tomaz Canabrava d83e8819ce [CSE] SetEncryptionFlagApiJob 
This new job sets the Encryption Flag in a folder.
 2017-10-18 21:51:39 +02:00
Tomaz Canabrava 623eb29845 [CSE] Helper functions for the URL's 2017-10-18 21:51:39 +02:00
Tomaz Canabrava 1436d5bac1 [CSE] Better debug output 2017-10-18 21:51:39 +02:00
Tomaz Canabrava 0b50afe915 [CSE] Correctly Set's the client as connected 
If we manage to encrypt and upload the private key
to the server, the client is in it's connected state.
 2017-10-18 21:51:39 +02:00
Tomaz Canabrava cfb6e3be8c [CSE] Send the Private Key to the server 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 78136a10b0 [CSE] Debug statements to help find the encrypt error 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 08dfe86f37 [CSE] Adjust the calls to ent-to-end encryption 
We changed the name.
 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 0f1480728e [cse] Use fake data to verify the encryption 
beware, this is broken.
 2017-10-18 21:51:38 +02:00
Tomaz Canabrava ba3d2a61d5 [cse] Call the encrypt and decrypt functions on fake data 2017-10-18 21:51:38 +02:00
Tomaz Canabrava e0d368cbb3 [cse] Update the encrypt and decrypt algorithm to GCM 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 4f7265c04f [aes] Create the Decrypt function. 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 6b53b4f257 [cse] Add the crypt method, based on OpenSSL Wiki 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 77c0309e02 [cse] use PKCS5_PBKDF2_HMAC_SHA1 on the random-word passphrase 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 5395fc56b1 [cse] Start the encryption algorithm for the Private Key 2017-10-18 21:51:38 +02:00
Tomaz Canabrava fd00e180f5 [aes] fix out of bounds access. 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 60729f1fc4 [cse] Enable OpenSSL for encryption 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 418401a33c [cse] new method, getUnifiedString 
Enter a string list, return a string.
 2017-10-18 21:51:38 +02:00
Tomaz Canabrava 2111aeaac1 [cse] Add wordlist & related methods. 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 69c709714d [cse] Save signed key on disk 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 090336c928 [cse] Correctly send the CSR 
finally.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 307dfd195c [cse] Call the CSR job. 
There's something wrong on the CSR job that I need to discover.
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 304231811d [cse] Start the job to sign the public key. 2017-10-18 21:51:37 +02:00
Tomaz Canabrava ecb05020a9 [cse] Do not save the certificate on disk 
Store it on memory, and discard it as soon as no longer
needed.
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava d2992d92ba [cse] Generate the CSE 
I still need to send it to the server. It's been a long
learning with the OpenSSL library.
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava c358980448 [cse] Link Against OpenSSL 
For some reason, this was working untill I added a call
to X509_REQ_get_subject_name, then the linking suddenly
stopped working (even tougth I'm using a ton of other
OpenSSL calls)

Force to link against 1.0
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 42a3098595 [cse] s/scr/csr 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 58e2e6b30b [cse] Generate the public / private keys and store locally 
Now I need to understand what the hell I need to do
to send this to the server.
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 8c342cb1dd [cse] Generate the KeyPair 
Not stored anywhere yet, but it's correctly running.
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 17693a75e5 [cse] Request public key from server 
This is the first step needed to properly communicate.
Next, get private key.
 2017-10-18 21:51:37 +02:00
Tomaz Canabrava f4bbec1019 [bugfix] Return the error code, don't discard it. 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 29b64640fa [cse] Start to fetch the basics to fetch the key from the server 2017-10-18 21:51:37 +02:00
Tomaz Canabrava 3f4d915a17 [cse] Add files to handle client side encryption 
This will be the responsible for encryption,
decryption and talking with the server.
 2017-10-18 21:51:36 +02:00
Tomaz Canabrava 7e2085375f [cse] Invalid read of 1 2017-10-18 21:51:36 +02:00