063f225a26
Encryption unit tests still failing, needs work Conflicts: 3rdparty/Archive/Tar.php 3rdparty/MDB2/Driver/Datatype/Common.php 3rdparty/MDB2/Driver/mysql.php 3rdparty/Sabre/CalDAV/CalendarQueryValidator.php 3rdparty/Sabre/CalDAV/Plugin.php 3rdparty/Sabre/CalDAV/Version.php 3rdparty/Sabre/CardDAV/AddressBook.php 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php 3rdparty/Sabre/CardDAV/Plugin.php 3rdparty/Sabre/CardDAV/Version.php 3rdparty/Sabre/DAV/Client.php 3rdparty/Sabre/DAV/Locks/Plugin.php 3rdparty/Sabre/DAV/Server.php 3rdparty/Sabre/DAV/Tree/Filesystem.php 3rdparty/Sabre/DAV/Version.php 3rdparty/Sabre/HTTP/BasicAuth.php 3rdparty/Sabre/HTTP/Version.php 3rdparty/Sabre/VObject/Component/VEvent.php 3rdparty/Sabre/VObject/DateTimeParser.php 3rdparty/Sabre/VObject/RecurrenceIterator.php 3rdparty/Sabre/VObject/Version.php 3rdparty/class.phpmailer.php 3rdparty/class.smtp.php 3rdparty/css/chosen-sprite.png 3rdparty/css/chosen.css 3rdparty/css/chosen/chosen.css 3rdparty/fullcalendar/css/fullcalendar.css 3rdparty/fullcalendar/css/fullcalendar.print.css 3rdparty/fullcalendar/js/fullcalendar.js 3rdparty/fullcalendar/js/fullcalendar.min.js 3rdparty/fullcalendar/js/gcal.js 3rdparty/js/chosen/VERSION 3rdparty/js/chosen/chosen.jquery.js 3rdparty/js/chosen/chosen.jquery.min.js 3rdparty/openid/class.openid.v3.php 3rdparty/openid/phpmyid.php 3rdparty/php-cloudfiles/cloudfiles.php 3rdparty/smb4php/smb.php 3rdparty/timepicker/css/jquery.ui.timepicker.css 3rdparty/timepicker/js/i18n/i18n.html 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js 3rdparty/timepicker/js/jquery.ui.timepicker.js 3rdparty/timepicker/releases.txt README apps/files/admin.php apps/files/ajax/autocomplete.php apps/files/ajax/move.php apps/files/ajax/newfile.php apps/files/ajax/scan.php apps/files/ajax/timezone.php apps/files/ajax/upload.php apps/files/appinfo/filesync.php apps/files/appinfo/update.php apps/files/css/files.css apps/files/index.php apps/files/js/fileactions.js apps/files/js/filelist.js apps/files/js/files.js apps/files/l10n/ar.php apps/files/l10n/bg_BG.php apps/files/l10n/ca.php apps/files/l10n/cs_CZ.php apps/files/l10n/da.php apps/files/l10n/de.php apps/files/l10n/el.php apps/files/l10n/eo.php apps/files/l10n/es.php apps/files/l10n/es_AR.php apps/files/l10n/et_EE.php apps/files/l10n/eu.php apps/files/l10n/fa.php apps/files/l10n/fi_FI.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/he.php apps/files/l10n/hr.php apps/files/l10n/hu_HU.php apps/files/l10n/ia.php apps/files/l10n/id.php apps/files/l10n/it.php apps/files/l10n/ja_JP.php apps/files/l10n/ko.php apps/files/l10n/lb.php apps/files/l10n/lt_LT.php apps/files/l10n/lv.php apps/files/l10n/mk.php apps/files/l10n/ms_MY.php apps/files/l10n/nb_NO.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/oc.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/ru_RU.php apps/files/l10n/si_LK.php apps/files/l10n/sk_SK.php apps/files/l10n/sl.php apps/files/l10n/sr.php apps/files/l10n/sr@latin.php apps/files/l10n/sv.php apps/files/l10n/th_TH.php apps/files/l10n/tr.php apps/files/l10n/uk.php apps/files/l10n/vi.php apps/files/l10n/zh_CN.GB2312.php apps/files/l10n/zh_CN.php apps/files/l10n/zh_TW.php apps/files/templates/admin.php apps/files/templates/index.php apps/files/templates/part.breadcrumb.php apps/files/templates/part.list.php apps/files_encryption/appinfo/app.php apps/files_encryption/appinfo/info.xml apps/files_encryption/js/settings.js apps/files_encryption/l10n/fa.php apps/files_encryption/l10n/sl.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/cryptstream.php apps/files_encryption/lib/proxy.php apps/files_encryption/settings.php apps/files_encryption/templates/settings.php apps/files_encryption/tests/encryption.php apps/files_encryption/tests/proxy.php apps/files_encryption/tests/stream.php apps/files_external/l10n/cs_CZ.php apps/files_external/l10n/et_EE.php apps/files_external/l10n/lt_LT.php apps/files_external/l10n/nl.php apps/files_external/l10n/ru.php apps/files_external/l10n/sk_SK.php apps/files_external/l10n/sl.php apps/files_external/l10n/vi.php apps/files_external/lib/config.php apps/files_external/lib/ftp.php apps/files_external/lib/smb.php apps/files_external/lib/streamwrapper.php apps/files_external/lib/swift.php apps/files_external/lib/webdav.php apps/files_external/tests/ftp.php apps/files_sharing/appinfo/update.php apps/files_sharing/css/public.css apps/files_sharing/js/share.js apps/files_sharing/l10n/de.php apps/files_sharing/l10n/et_EE.php apps/files_sharing/l10n/ja_JP.php apps/files_sharing/l10n/nb_NO.php apps/files_sharing/l10n/ru.php apps/files_sharing/l10n/sl.php apps/files_sharing/l10n/vi.php apps/files_sharing/lib/share/file.php apps/files_sharing/lib/share/folder.php apps/files_sharing/lib/sharedstorage.php apps/files_sharing/public.php apps/files_sharing/templates/public.php apps/files_versions/l10n/et_EE.php apps/files_versions/l10n/lt_LT.php apps/files_versions/l10n/nb_NO.php apps/files_versions/l10n/nl.php apps/files_versions/l10n/ru.php apps/files_versions/l10n/sl.php apps/files_versions/l10n/vi.php apps/files_versions/lib/hooks.php apps/files_versions/lib/versions.php apps/user_ldap/appinfo/database.xml apps/user_ldap/appinfo/update.php apps/user_ldap/group_ldap.php apps/user_ldap/l10n/da.php apps/user_ldap/l10n/et_EE.php apps/user_ldap/l10n/pt_PT.php apps/user_ldap/l10n/sl.php apps/user_ldap/l10n/vi.php apps/user_ldap/l10n/zh_CN.php apps/user_ldap/lib/access.php apps/user_ldap/lib/connection.php apps/user_ldap/settings.php apps/user_ldap/templates/settings.php apps/user_ldap/tests/group_ldap.php apps/user_ldap/user_ldap.php apps/user_webdavauth/appinfo/app.php apps/user_webdavauth/appinfo/info.xml apps/user_webdavauth/settings.php apps/user_webdavauth/templates/settings.php apps/user_webdavauth/user_webdavauth.php autotest.sh core/ajax/appconfig.php core/ajax/share.php core/ajax/translations.php core/ajax/vcategories/add.php core/ajax/vcategories/delete.php core/ajax/vcategories/edit.php core/css/share.css core/js/eventsource.js core/js/js.js core/js/oc-vcategories.js core/js/share.js core/l10n/ar.php core/l10n/bg_BG.php core/l10n/ca.php core/l10n/cs_CZ.php core/l10n/da.php core/l10n/de.php core/l10n/el.php core/l10n/eo.php core/l10n/es.php core/l10n/es_AR.php core/l10n/et_EE.php core/l10n/eu.php core/l10n/fa.php core/l10n/fi_FI.php core/l10n/fr.php core/l10n/gl.php core/l10n/he.php core/l10n/hi.php core/l10n/hr.php core/l10n/hu_HU.php core/l10n/ia.php core/l10n/id.php core/l10n/it.php core/l10n/ja_JP.php core/l10n/ko.php core/l10n/ku_IQ.php core/l10n/lb.php core/l10n/lt_LT.php core/l10n/lv.php core/l10n/mk.php core/l10n/ms_MY.php core/l10n/nb_NO.php core/l10n/nl.php core/l10n/nn_NO.php core/l10n/oc.php core/l10n/pl.php core/l10n/pt_BR.php core/l10n/pt_PT.php core/l10n/ro.php core/l10n/ru.php core/l10n/ru_RU.php core/l10n/si_LK.php core/l10n/sk_SK.php core/l10n/sl.php core/l10n/sr.php core/l10n/sr@latin.php core/l10n/sv.php core/l10n/th_TH.php core/l10n/tr.php core/l10n/uk.php core/l10n/vi.php core/l10n/zh_CN.GB2312.php core/l10n/zh_CN.php core/l10n/zh_TW.php core/lostpassword/index.php core/lostpassword/resetpassword.php core/templates/layout.base.php core/templates/layout.guest.php core/templates/layout.user.php cron.php db_structure.xml files/webdav.php index.php l10n/.tx/config l10n/af/calendar.po l10n/af/contacts.po l10n/af/core.po l10n/af/files.po l10n/ar/calendar.po l10n/ar/contacts.po l10n/ar/core.po l10n/ar/files.po l10n/ar/files_encryption.po l10n/ar/lib.po l10n/ar/media.po l10n/ar/settings.po l10n/ar_SA/core.po l10n/ar_SA/files.po l10n/bg_BG/calendar.po l10n/bg_BG/contacts.po l10n/bg_BG/core.po l10n/bg_BG/files.po l10n/bg_BG/lib.po l10n/bg_BG/media.po l10n/bg_BG/settings.po l10n/ca/calendar.po l10n/ca/contacts.po l10n/ca/core.po l10n/ca/files.po l10n/ca/gallery.po l10n/ca/lib.po l10n/ca/settings.po l10n/cs_CZ/calendar.po l10n/cs_CZ/contacts.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/cs_CZ/files_external.po l10n/cs_CZ/gallery.po l10n/cs_CZ/lib.po l10n/cs_CZ/settings.po l10n/da/calendar.po l10n/da/contacts.po l10n/da/core.po l10n/da/files.po l10n/da/lib.po l10n/da/settings.po l10n/da/user_ldap.po l10n/de/calendar.po l10n/de/contacts.po l10n/de/core.po l10n/de/files.po l10n/de/files_sharing.po l10n/de/gallery.po l10n/de/lib.po l10n/de/settings.po l10n/de_DE/core.po l10n/de_DE/files.po l10n/de_DE/settings.po l10n/el/calendar.po l10n/el/contacts.po l10n/el/core.po l10n/el/files.po l10n/el/gallery.po l10n/el/lib.po l10n/el/settings.po l10n/eo/calendar.po l10n/eo/contacts.po l10n/eo/core.po l10n/eo/files.po l10n/eo/lib.po l10n/eo/media.po l10n/eo/settings.po l10n/es/calendar.po l10n/es/contacts.po l10n/es/core.po l10n/es/files.po l10n/es/gallery.po l10n/es/lib.po l10n/es/settings.po l10n/es_AR/core.po l10n/es_AR/files.po l10n/es_AR/lib.po l10n/es_AR/settings.po l10n/et_EE/calendar.po l10n/et_EE/contacts.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/files_external.po l10n/et_EE/files_sharing.po l10n/et_EE/files_versions.po l10n/et_EE/lib.po l10n/et_EE/settings.po l10n/et_EE/user_ldap.po l10n/eu/calendar.po l10n/eu/contacts.po l10n/eu/core.po l10n/eu/files.po l10n/eu/lib.po l10n/eu/settings.po l10n/eu_ES/core.po l10n/eu_ES/files.po l10n/fa/calendar.po l10n/fa/contacts.po l10n/fa/core.po l10n/fa/files.po l10n/fa/files_encryption.po l10n/fa/lib.po l10n/fa/settings.po l10n/fi/core.po l10n/fi/files.po l10n/fi_FI/calendar.po l10n/fi_FI/contacts.po l10n/fi_FI/core.po l10n/fi_FI/files.po l10n/fi_FI/gallery.po l10n/fi_FI/lib.po l10n/fi_FI/settings.po l10n/fr/calendar.po l10n/fr/contacts.po l10n/fr/core.po l10n/fr/files.po l10n/fr/gallery.po l10n/fr/lib.po l10n/fr/media.po l10n/fr/settings.po l10n/gl/calendar.po l10n/gl/contacts.po l10n/gl/core.po l10n/gl/files.po l10n/gl/lib.po l10n/gl/settings.po l10n/he/calendar.po l10n/he/contacts.po l10n/he/core.po l10n/he/files.po l10n/he/lib.po l10n/he/settings.po l10n/hi/core.po l10n/hi/files.po l10n/hi/lib.po l10n/hi/settings.po l10n/hr/calendar.po l10n/hr/contacts.po l10n/hr/core.po l10n/hr/files.po l10n/hr/lib.po l10n/hr/settings.po l10n/hu_HU/calendar.po l10n/hu_HU/contacts.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/lib.po l10n/hu_HU/settings.po l10n/hy/calendar.po l10n/hy/contacts.po l10n/hy/core.po l10n/hy/files.po l10n/ia/calendar.po l10n/ia/contacts.po l10n/ia/core.po l10n/ia/files.po l10n/ia/lib.po l10n/ia/settings.po l10n/id/calendar.po l10n/id/contacts.po l10n/id/core.po l10n/id/files.po l10n/id/files_encryption.po l10n/id/files_external.po l10n/id/files_sharing.po l10n/id/files_versions.po l10n/id/lib.po l10n/id/settings.po l10n/id/user_ldap.po l10n/id_ID/core.po l10n/id_ID/files.po l10n/it/calendar.po l10n/it/contacts.po l10n/it/core.po l10n/it/files.po l10n/it/gallery.po l10n/it/lib.po l10n/it/settings.po l10n/ja_JP/calendar.po l10n/ja_JP/contacts.po l10n/ja_JP/core.po l10n/ja_JP/files.po l10n/ja_JP/files_sharing.po l10n/ja_JP/lib.po l10n/ja_JP/settings.po l10n/ko/calendar.po l10n/ko/contacts.po l10n/ko/core.po l10n/ko/files.po l10n/ko/lib.po l10n/ko/settings.po l10n/ku_IQ/core.po l10n/ku_IQ/files.po l10n/ku_IQ/lib.po l10n/ku_IQ/settings.po l10n/lb/calendar.po l10n/lb/contacts.po l10n/lb/core.po l10n/lb/files.po l10n/lb/lib.po l10n/lb/settings.po l10n/lt_LT/calendar.po l10n/lt_LT/contacts.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lt_LT/files_external.po l10n/lt_LT/files_versions.po l10n/lt_LT/lib.po l10n/lt_LT/settings.po l10n/lv/core.po l10n/lv/files.po l10n/lv/lib.po l10n/lv/settings.po l10n/mk/calendar.po l10n/mk/contacts.po l10n/mk/core.po l10n/mk/files.po l10n/mk/lib.po l10n/mk/settings.po l10n/ms_MY/calendar.po l10n/ms_MY/contacts.po l10n/ms_MY/core.po l10n/ms_MY/files.po l10n/ms_MY/lib.po l10n/ms_MY/settings.po l10n/nb_NO/calendar.po l10n/nb_NO/contacts.po l10n/nb_NO/core.po l10n/nb_NO/files.po l10n/nb_NO/files_sharing.po l10n/nb_NO/files_versions.po l10n/nb_NO/gallery.po l10n/nb_NO/lib.po l10n/nb_NO/settings.po l10n/nb_NO/user_ldap.po l10n/nl/calendar.po l10n/nl/contacts.po l10n/nl/core.po l10n/nl/files.po l10n/nl/files_external.po l10n/nl/files_versions.po l10n/nl/gallery.po l10n/nl/lib.po l10n/nl/settings.po l10n/nl/user_ldap.po l10n/nn_NO/calendar.po l10n/nn_NO/contacts.po l10n/nn_NO/core.po l10n/nn_NO/files.po l10n/nn_NO/lib.po l10n/nn_NO/settings.po l10n/oc/core.po l10n/oc/files.po l10n/oc/lib.po l10n/oc/settings.po l10n/pl/calendar.po l10n/pl/contacts.po l10n/pl/core.po l10n/pl/files.po l10n/pl/gallery.po l10n/pl/lib.po l10n/pl/settings.po l10n/pl_PL/core.po l10n/pl_PL/files.po l10n/pl_PL/lib.po l10n/pl_PL/settings.po l10n/pt_BR/calendar.po l10n/pt_BR/contacts.po l10n/pt_BR/core.po l10n/pt_BR/files.po l10n/pt_BR/lib.po l10n/pt_BR/settings.po l10n/pt_PT/calendar.po l10n/pt_PT/contacts.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/gallery.po l10n/pt_PT/lib.po l10n/pt_PT/settings.po l10n/pt_PT/user_ldap.po l10n/ro/calendar.po l10n/ro/contacts.po l10n/ro/core.po l10n/ro/files.po l10n/ro/lib.po l10n/ro/settings.po l10n/ru/calendar.po l10n/ru/contacts.po l10n/ru/core.po l10n/ru/files.po l10n/ru/files_external.po l10n/ru/files_sharing.po l10n/ru/files_versions.po l10n/ru/gallery.po l10n/ru/lib.po l10n/ru/settings.po l10n/ru_RU/core.po l10n/ru_RU/files.po l10n/ru_RU/lib.po l10n/ru_RU/settings.po l10n/si_LK/core.po l10n/si_LK/files.po l10n/si_LK/files_encryption.po l10n/si_LK/files_external.po l10n/si_LK/files_sharing.po l10n/si_LK/files_versions.po l10n/si_LK/lib.po l10n/si_LK/settings.po l10n/si_LK/user_ldap.po l10n/sk_SK/calendar.po l10n/sk_SK/contacts.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sk_SK/files_external.po l10n/sk_SK/lib.po l10n/sk_SK/settings.po l10n/sk_SK/user_ldap.po l10n/sl/calendar.po l10n/sl/contacts.po l10n/sl/core.po l10n/sl/files.po l10n/sl/files_encryption.po l10n/sl/files_external.po l10n/sl/files_sharing.po l10n/sl/files_versions.po l10n/sl/gallery.po l10n/sl/lib.po l10n/sl/settings.po l10n/sl/user_ldap.po l10n/so/core.po l10n/so/files.po l10n/sr/calendar.po l10n/sr/contacts.po l10n/sr/core.po l10n/sr/files.po l10n/sr/lib.po l10n/sr/settings.po l10n/sr@latin/calendar.po l10n/sr@latin/contacts.po l10n/sr@latin/core.po l10n/sr@latin/files.po l10n/sr@latin/lib.po l10n/sr@latin/settings.po l10n/sv/calendar.po l10n/sv/contacts.po l10n/sv/core.po l10n/sv/files.po l10n/sv/gallery.po l10n/sv/lib.po l10n/sv/media.po l10n/sv/settings.po l10n/ta_LK/core.po l10n/ta_LK/files.po l10n/ta_LK/lib.po l10n/ta_LK/settings.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/th_TH/calendar.po l10n/th_TH/contacts.po l10n/th_TH/core.po l10n/th_TH/files.po l10n/th_TH/gallery.po l10n/th_TH/lib.po l10n/th_TH/settings.po l10n/tr/calendar.po l10n/tr/contacts.po l10n/tr/core.po l10n/tr/files.po l10n/tr/gallery.po l10n/tr/lib.po l10n/tr/settings.po l10n/uk/calendar.po l10n/uk/contacts.po l10n/uk/core.po l10n/uk/files.po l10n/uk/files_encryption.po l10n/uk/files_versions.po l10n/uk/lib.po l10n/uk/media.po l10n/uk/settings.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/vi/files_sharing.po l10n/vi/files_versions.po l10n/vi/lib.po l10n/vi/settings.po l10n/vi/user_ldap.po l10n/zh_CN.GB2312/core.po l10n/zh_CN.GB2312/files.po l10n/zh_CN.GB2312/lib.po l10n/zh_CN.GB2312/settings.po l10n/zh_CN/calendar.po l10n/zh_CN/contacts.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/files_external.po l10n/zh_CN/gallery.po l10n/zh_CN/lib.po l10n/zh_CN/settings.po l10n/zh_CN/user_ldap.po l10n/zh_TW/calendar.po l10n/zh_TW/contacts.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/lib.po l10n/zh_TW/settings.po lib/MDB2/Driver/sqlite3.php lib/app.php lib/appconfig.php lib/archive.php lib/archive/tar.php lib/archive/zip.php lib/base.php lib/connector/sabre/auth.php lib/connector/sabre/directory.php lib/connector/sabre/file.php lib/connector/sabre/locks.php lib/connector/sabre/node.php lib/db.php lib/eventsource.php lib/filecache.php lib/filecache/cached.php lib/filecache/update.php lib/filechunking.php lib/fileproxy.php lib/fileproxy/fileoperations.php lib/fileproxy/quota.php lib/files.php lib/filestorage.php lib/filestorage/common.php lib/filestorage/commontest.php lib/filestorage/local.php lib/filesystem.php lib/filesystemview.php lib/group.php lib/group/dummy.php lib/group/example.php lib/helper.php lib/image.php lib/installer.php lib/json.php lib/l10n.php lib/l10n/ca.php lib/l10n/cs_CZ.php lib/l10n/da.php lib/l10n/de.php lib/l10n/el.php lib/l10n/eo.php lib/l10n/es.php lib/l10n/es_AR.php lib/l10n/et_EE.php lib/l10n/eu.php lib/l10n/fa.php lib/l10n/fi_FI.php lib/l10n/fr.php lib/l10n/gl.php lib/l10n/he.php lib/l10n/hu_HU.php lib/l10n/it.php lib/l10n/ja_JP.php lib/l10n/lt_LT.php lib/l10n/nb_NO.php lib/l10n/nl.php lib/l10n/oc.php lib/l10n/pl.php lib/l10n/pt_BR.php lib/l10n/pt_PT.php lib/l10n/ro.php lib/l10n/ru.php lib/l10n/ru_RU.php lib/l10n/sk_SK.php lib/l10n/sl.php lib/l10n/sv.php lib/l10n/th_TH.php lib/l10n/uk.php lib/l10n/vi.php lib/l10n/zh_CN.GB2312.php lib/l10n/zh_CN.php lib/l10n/zh_TW.php lib/log.php lib/log/owncloud.php lib/mail.php lib/migrate.php lib/migration/content.php lib/minimizer.php lib/ocs.php lib/ocsclient.php lib/preferences.php lib/public/backgroundjob.php lib/public/db.php lib/public/share.php lib/public/util.php lib/request.php lib/search.php lib/search/provider/file.php lib/search/result.php lib/setup.php lib/streamwrappers.php lib/template.php lib/templatelayout.php lib/updater.php lib/user.php lib/user/database.php lib/user/http.php lib/util.php lib/vcategories.php lib/vobject.php public.php remote.php search/ajax/search.php settings/admin.php settings/ajax/apps/ocs.php settings/ajax/changepassword.php settings/ajax/creategroup.php settings/ajax/createuser.php settings/ajax/disableapp.php settings/ajax/enableapp.php settings/ajax/getlog.php settings/ajax/lostpassword.php settings/ajax/openid.php settings/ajax/removegroup.php settings/ajax/removeuser.php settings/ajax/setlanguage.php settings/ajax/setloglevel.php settings/ajax/setquota.php settings/ajax/togglegroups.php settings/ajax/togglesubadmins.php settings/ajax/userlist.php settings/apps.php settings/css/settings.css settings/help.php settings/js/apps.js settings/js/users.js settings/l10n/ar.php settings/l10n/bg_BG.php settings/l10n/ca.php settings/l10n/cs_CZ.php settings/l10n/da.php settings/l10n/de.php settings/l10n/el.php settings/l10n/eo.php settings/l10n/es.php settings/l10n/es_AR.php settings/l10n/et_EE.php settings/l10n/eu.php settings/l10n/fa.php settings/l10n/fi_FI.php settings/l10n/fr.php settings/l10n/gl.php settings/l10n/hr.php settings/l10n/hu_HU.php settings/l10n/id.php settings/l10n/it.php settings/l10n/ja_JP.php settings/l10n/ko.php settings/l10n/lb.php settings/l10n/lt_LT.php settings/l10n/lv.php settings/l10n/ms_MY.php settings/l10n/nb_NO.php settings/l10n/nl.php settings/l10n/nn_NO.php settings/l10n/oc.php settings/l10n/pl.php settings/l10n/pt_BR.php settings/l10n/pt_PT.php settings/l10n/ro.php settings/l10n/ru.php settings/l10n/ru_RU.php settings/l10n/si_LK.php settings/l10n/sk_SK.php settings/l10n/sl.php settings/l10n/sr.php settings/l10n/sr@latin.php settings/l10n/sv.php settings/l10n/th_TH.php settings/l10n/tr.php settings/l10n/uk.php settings/l10n/vi.php settings/l10n/zh_CN.GB2312.php settings/l10n/zh_CN.php settings/l10n/zh_TW.php settings/personal.php settings/settings.php settings/templates/admin.php settings/templates/apps.php settings/templates/help.php settings/templates/personal.php settings/templates/users.php settings/trans.png settings/users.php tests/bootstrap.php tests/data/db_structure.xml tests/lib/archive.php tests/lib/cache.php tests/lib/cache/apc.php tests/lib/cache/xcache.php tests/lib/db.php tests/lib/filesystem.php tests/lib/geo.php tests/lib/share/share.php tests/lib/streamwrappers.php tests/lib/util.php tests/phpunit.xml
522 lines
15 KiB
PHP
522 lines
15 KiB
PHP
<?php
|
|
/**
|
|
* ownCloud
|
|
*
|
|
* @author Robin Appelman
|
|
* @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
|
|
* <icewind1991@gmail.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* License as published by the Free Software Foundation; either
|
|
* version 3 of the License, or any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
/**
|
|
* transparently encrypted filestream
|
|
*
|
|
* you can use it as wrapper around an existing stream by setting CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
|
|
* and then fopen('crypt://streams/foo');
|
|
*/
|
|
|
|
namespace OCA\Encryption;
|
|
|
|
/**
|
|
* @brief Provides 'crypt://' stream wrapper protocol.
|
|
* @note We use a stream wrapper because it is the most secure way to handle
|
|
* decrypted content transfers. There is no safe way to decrypt the entire file
|
|
* somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
|
|
* @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
|
|
* crypt://filename, or crypt://subdirectory/filename, NOT
|
|
* crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
|
|
* [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
|
|
* will not be accessible to other methods.
|
|
* @note Data read and written must always be 8192 bytes long, as this is the
|
|
* buffer size used internally by PHP. The encryption process makes the input
|
|
* data longer, and input is chunked into smaller pieces in order to result in
|
|
* a 8192 encrypted block size.
|
|
*/
|
|
class Stream {
|
|
|
|
public static $sourceStreams = array();
|
|
|
|
# TODO: make all below properties private again once unit testing is configured correctly
|
|
public $rawPath; // The raw path received by stream_open
|
|
public $path_f; // The raw path formatted to include username and data directory
|
|
private $userId;
|
|
private $handle; // Resource returned by fopen
|
|
private $path;
|
|
private $readBuffer; // For streams that dont support seeking
|
|
private $meta = array(); // Header / meta for source stream
|
|
private $count;
|
|
private $writeCache;
|
|
public $size;
|
|
private $publicKey;
|
|
private $keyfile;
|
|
private $encKeyfile;
|
|
private static $view;
|
|
|
|
public function stream_open( $path, $mode, $options, &$opened_path ) {
|
|
|
|
//file_put_contents('/home/samtuke/newtmp.txt', 'stream_open('.$path.')' );
|
|
|
|
// Get access to filesystem via filesystemview object
|
|
if ( !self::$view ) {
|
|
|
|
self::$view = new \OC_FilesystemView( $this->userId . '/' );
|
|
|
|
}
|
|
|
|
$this->userId = \OCP\User::getUser();
|
|
|
|
// Get the bare file path
|
|
$path = str_replace( 'crypt://', '', $path );
|
|
|
|
$this->rawPath = $path;
|
|
|
|
$this->path_f = $this->userId . '/files/' . $path;
|
|
|
|
if (
|
|
dirname( $path ) == 'streams'
|
|
and isset( self::$sourceStreams[basename( $path )] )
|
|
) {
|
|
|
|
// Is this just for unit testing purposes?
|
|
|
|
$this->handle = self::$sourceStreams[basename( $path )]['stream'];
|
|
|
|
$this->path = self::$sourceStreams[basename( $path )]['path'];
|
|
|
|
$this->size = self::$sourceStreams[basename( $path )]['size'];
|
|
|
|
} else {
|
|
|
|
if (
|
|
$mode == 'w'
|
|
or $mode == 'w+'
|
|
or $mode == 'wb'
|
|
or $mode == 'wb+'
|
|
) {
|
|
|
|
$this->size = 0;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$this->size = self::$view->filesize( $this->path_f, $mode );
|
|
|
|
//$this->size = filesize( $path );
|
|
|
|
}
|
|
|
|
// Disable fileproxies so we can open the source file without recursive encryption
|
|
\OC_FileProxy::$enabled = false;
|
|
|
|
//$this->handle = fopen( $path, $mode );
|
|
|
|
$this->handle = self::$view->fopen( $this->path_f, $mode );
|
|
|
|
//file_put_contents('/home/samtuke/newtmp.txt', 'fucking hopeless = '.$path );
|
|
|
|
\OC_FileProxy::$enabled = true;
|
|
|
|
if ( !is_resource( $this->handle ) ) {
|
|
|
|
\OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( is_resource( $this->handle ) ) {
|
|
|
|
$this->meta = stream_get_meta_data( $this->handle );
|
|
|
|
}
|
|
|
|
return is_resource( $this->handle );
|
|
|
|
}
|
|
|
|
public function stream_seek( $offset, $whence = SEEK_SET ) {
|
|
|
|
$this->flush();
|
|
|
|
fseek( $this->handle, $offset, $whence );
|
|
|
|
}
|
|
|
|
public function stream_tell() {
|
|
return ftell($this->handle);
|
|
}
|
|
|
|
public function stream_read( $count ) {
|
|
|
|
// file_put_contents('/home/samtuke/newtmp.txt', "\$count = $count" );
|
|
|
|
$this->writeCache = '';
|
|
|
|
if ( $count != 8192 ) {
|
|
|
|
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
|
|
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
|
|
\OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', OCP\Util::FATAL );
|
|
|
|
die();
|
|
|
|
}
|
|
|
|
// $pos = ftell( $this->handle );
|
|
//
|
|
// Get the data from the file handle
|
|
$data = fread( $this->handle, 8192 );
|
|
|
|
//echo "\n\nPRE DECRYPTION = $data\n\n";
|
|
//
|
|
if ( strlen( $data ) ) {
|
|
|
|
$this->getKey();
|
|
|
|
//$key = file_get_contents( '/home/samtuke/owncloud/git/oc3/data/admin/files_encryption/keyfiles/tmp-1346255589.key' );
|
|
|
|
$result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
|
|
|
|
// file_put_contents('/home/samtuke/newtmp.txt', '$result = '.$result );
|
|
|
|
// echo "\n\n\n\n-----------------------------\n\nNEWS";
|
|
//
|
|
// echo "\n\n\$data = $data";
|
|
//
|
|
// echo "\n\n\$key = {$this->keyfile}";
|
|
//
|
|
// echo "\n\n\$result = $result";
|
|
//
|
|
// echo "\n\n\n\n-----------------------------\n\n";
|
|
|
|
//trigger_error("CAT $result");
|
|
|
|
} else {
|
|
|
|
$result = '';
|
|
|
|
}
|
|
|
|
// $length = $this->size - $pos;
|
|
//
|
|
// if ( $length < 8192 ) {
|
|
//
|
|
// $result = substr( $result, 0, $length );
|
|
//
|
|
// }
|
|
|
|
return $result;
|
|
|
|
}
|
|
|
|
/**
|
|
* @brief Encrypt and pad data ready for writting to disk
|
|
* @param string $plainData data to be encrypted
|
|
* @param string $key key to use for encryption
|
|
* @return encrypted data on success, false on failure
|
|
*/
|
|
public function preWriteEncrypt( $plainData, $key ) {
|
|
|
|
// Encrypt data to 'catfile', which includes IV
|
|
if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
|
|
|
|
return $encrypted;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* @brief Get the keyfile for the current file, generate one if necessary
|
|
* @param bool $generate if true, a new key will be generated if none can be found
|
|
* @return bool true on key found and set, false on key not found and new key generated and set
|
|
*/
|
|
public function getKey() {
|
|
|
|
//echo "\n\$this->rawPath = {$this->rawPath}";
|
|
|
|
// If a keyfile already exists for a file named identically to file to be written
|
|
if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
|
|
|
|
# TODO: add error handling for when file exists but no keyfile
|
|
|
|
// Fetch existing keyfile
|
|
$this->encKeyfile = Keymanager::getFileKey( $this->rawPath );
|
|
|
|
$this->getUser();
|
|
|
|
$session = new Session();
|
|
|
|
$this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $session->getPrivateKey( $this->userId ) );
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
public function getuser() {
|
|
|
|
// Only get the user again if it isn't already set
|
|
if ( empty( $this->userId ) ) {
|
|
|
|
# TODO: Move this user call out of here - it belongs elsewhere
|
|
$this->userId = \OCP\User::getUser();
|
|
|
|
}
|
|
|
|
# TODO: Add a method for getting the user in case OCP\User::
|
|
# getUser() doesn't work (can that scenario ever occur?)
|
|
|
|
}
|
|
|
|
/**
|
|
* @brief Handle plain data from the stream, and write it in 8192 byte blocks
|
|
* @param string $data data to be written to disk
|
|
* @note the data will be written to the path stored in the stream handle, set in stream_open()
|
|
* @note $data is only ever be a maximum of 8192 bytes long. This is set by PHP internally. stream_write() is called multiple times in a loop on data larger than 8192 bytes
|
|
* @note Because the encryption process used increases the length of $data, a writeCache is used to carry over data which would not fit in the required block size
|
|
* @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
|
|
* @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
|
|
*/
|
|
public function stream_write( $data ) {
|
|
trigger_error("goon");
|
|
// Disable the file proxies so that encryption is not automatically attempted when the file is written to disk - we are handling that separately here and we don't want to get into an infinite loop
|
|
\OC_FileProxy::$enabled = false;
|
|
|
|
// Get the length of the unencrypted data that we are handling
|
|
$length = strlen( $data );
|
|
|
|
// So far this round, no data has been written
|
|
$written = 0;
|
|
|
|
// Find out where we are up to in the writing of data to the file
|
|
$pointer = ftell( $this->handle );
|
|
|
|
//echo "\n\n\$rawLength = $length\n";
|
|
|
|
//echo "\$pointer = $pointer\n";
|
|
|
|
// Make sure the userId is set
|
|
$this->getuser();
|
|
|
|
// Get / generate the keyfile for the file we're handling
|
|
// If we're writing a new file (not overwriting an existing one), save the newly generated keyfile
|
|
if ( ! $this->getKey() ) {
|
|
|
|
$this->keyfile = Crypt::generateKey();
|
|
|
|
$this->publicKey = Keymanager::getPublicKey( $this->userId );
|
|
|
|
$this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
|
|
|
|
// Save the new encrypted file key
|
|
Keymanager::setFileKey( $this->rawPath, $this->encKeyfile, new \OC_FilesystemView( '/' ) );
|
|
|
|
# TODO: move this new OCFSV out of here some how, use DI
|
|
|
|
}
|
|
|
|
// If extra data is left over from the last round, make sure it is integrated into the next 6126 / 8192 block
|
|
if ( $this->writeCache ) {
|
|
|
|
// Concat writeCache to start of $data
|
|
$data = $this->writeCache . $data;
|
|
|
|
//echo "\n\ncache + data length = ".strlen($data)."\n";
|
|
|
|
// Clear the write cache, ready for resuse - it has been flushed and its old contents processed
|
|
$this->writeCache = '';
|
|
|
|
}
|
|
//
|
|
// // Make sure we always start on a block start
|
|
if ( 0 != ( $pointer % 8192 ) ) { // if the current positoin of file indicator is not aligned to a 8192 byte block, fix it so that it is
|
|
//
|
|
//echo "\n\nNOT ON BLOCK START ";
|
|
// echo $pointer % 8192;
|
|
//
|
|
// echo "\n\n1. $currentPos\n\n";
|
|
// //
|
|
// echo "ftell() = ".ftell($this->handle)."\n";
|
|
|
|
// fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
|
|
//
|
|
// $pointer = ftell( $this->handle );
|
|
|
|
// echo "ftell() = ".ftell($this->handle)."\n";
|
|
//
|
|
// $unencryptedNewBlock = fread( $this->handle, 8192 );
|
|
//
|
|
// echo "\n\n2. $currentPos\n\n";
|
|
//
|
|
// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
|
|
//
|
|
// echo "\n\n3. $currentPos\n\n";
|
|
//
|
|
// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
|
|
//
|
|
// $x = substr( $block, 0, $currentPos % 8192 );
|
|
//
|
|
// $data = $x . $data;
|
|
//
|
|
// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
|
|
//
|
|
}
|
|
|
|
// $currentPos = ftell( $this->handle );
|
|
|
|
// // While there still remains somed data to be processed & written
|
|
while( strlen( $data ) > 0 ) {
|
|
//
|
|
// // Remaining length for this iteration, not of the entire file (may be greater than 8192 bytes)
|
|
// $remainingLength = strlen( $data );
|
|
//
|
|
// // If data remaining to be written is less than the size of 1 6126 byte block
|
|
if ( strlen( $data ) < 6126 ) {
|
|
|
|
// Set writeCache to contents of $data
|
|
// The writeCache will be carried over to the next write round, and added to the start of $data to ensure that written blocks are always the correct length. If there is still data in writeCache after the writing round has finished, then the data will be written to disk by $this->flush().
|
|
$this->writeCache = $data;
|
|
|
|
// Clear $data ready for next round
|
|
$data = '';
|
|
//
|
|
} else {
|
|
|
|
//echo "\n\nbefore before ".strlen($data)."\n";
|
|
|
|
// Read the chunk from the start of $data
|
|
$chunk = substr( $data, 0, 6126 );
|
|
|
|
//echo "before ".strlen($data)."\n";
|
|
|
|
//echo "\n\$this->keyfile 1 = {$this->keyfile}";
|
|
|
|
$encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
|
|
|
|
//echo "\n\n\$rawEnc = $encrypted\n\n";
|
|
|
|
//echo "\$encrypted = ".strlen($encrypted)."\n";
|
|
|
|
//echo "written = ".strlen($encrypted)."\n";
|
|
|
|
//echo "after ".strlen($encrypted)."\n\n";
|
|
|
|
//file_put_contents('/home/samtuke/tmp.txt', $encrypted);
|
|
|
|
// Write the data chunk to disk. This will be addended to the last data chunk if the file being handled totals more than 6126 bytes
|
|
fwrite( $this->handle, $encrypted );
|
|
|
|
//$bef = ftell( $this->handle );
|
|
//echo "ftell before = $bef\n";
|
|
|
|
$writtenLen = strlen( $encrypted );
|
|
//fseek( $this->handle, $writtenLen, SEEK_CUR );
|
|
|
|
// $aft = ftell( $this->handle );
|
|
// echo "ftell after = $aft\n";
|
|
// echo "ftell sum = ";
|
|
// echo $aft - $bef."\n";
|
|
|
|
// Remove the chunk we just processed from $data, leaving only unprocessed data in $data var, for handling on the next round
|
|
$data = substr( $data, 6126 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$this->size = max( $this->size, $pointer + $length );
|
|
|
|
//echo "\$this->size = $this->size\n\n";
|
|
|
|
return $length;
|
|
|
|
}
|
|
|
|
|
|
public function stream_set_option($option,$arg1,$arg2) {
|
|
switch($option) {
|
|
case STREAM_OPTION_BLOCKING:
|
|
stream_set_blocking($this->handle,$arg1);
|
|
break;
|
|
case STREAM_OPTION_READ_TIMEOUT:
|
|
stream_set_timeout($this->handle,$arg1,$arg2);
|
|
break;
|
|
case STREAM_OPTION_WRITE_BUFFER:
|
|
stream_set_write_buffer($this->handle,$arg1,$arg2);
|
|
}
|
|
}
|
|
|
|
public function stream_stat() {
|
|
return fstat($this->handle);
|
|
}
|
|
|
|
public function stream_lock($mode) {
|
|
flock($this->handle,$mode);
|
|
}
|
|
|
|
public function stream_flush() {
|
|
|
|
return fflush($this->handle); // Not a typo: http://php.net/manual/en/function.fflush.php
|
|
|
|
}
|
|
|
|
public function stream_eof() {
|
|
return feof($this->handle);
|
|
}
|
|
|
|
private function flush() {
|
|
|
|
if ( $this->writeCache ) {
|
|
|
|
// Set keyfile property for file in question
|
|
$this->getKey();
|
|
|
|
$encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
|
|
|
|
fwrite( $this->handle, $encrypted );
|
|
|
|
$this->writeCache = '';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
public function stream_close() {
|
|
|
|
$this->flush();
|
|
|
|
if ($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
|
|
|
|
\OC_FileCache::put($this->path,array('encrypted'=>true,'size'=>$this->size),'');
|
|
|
|
}
|
|
|
|
return fclose($this->handle);
|
|
|
|
}
|
|
|
|
}
|