mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into file_encryption_util_is_error 

Conflicts:
	apps/files_encryption/lib/util.php
This commit is contained in:
Florin Peter 2013-05-27 14:41:53 +02:00
parent 89f0c8f39d 5e243b48bb
commit 80433fc4c4
689 changed files with 2386 additions and 2008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/l10n/hu_HU.php
View File

@ -46,6 +46,7 @@
"{count} folders" => "{count} mappa",
"1 file" => "1 fájl",
"{count} files" => "{count} fájl",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
"Unable to rename file" => "Nem lehet átnevezni a fájlt",
"Upload" => "Feltöltés",
"File handling" => "Fájlkezelés",

1
apps/files_encryption/l10n/ar.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "جاري الحفظ...",
"Encryption" => "التشفير"
);

1
apps/files_encryption/l10n/bg_BG.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Записване...",
"Encryption" => "Криптиране"
);

1
apps/files_encryption/l10n/bn_BD.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "সংরক্ষণ করা হচ্ছে..",
"Encryption" => "সংকেতায়ন"
);

1
apps/files_encryption/l10n/ca.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Desant...",
"Encryption" => "Xifrat"
);

1
apps/files_encryption/l10n/cs_CZ.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Ukládám...",
"Encryption" => "Šifrování"
);

1
apps/files_encryption/l10n/cy_GB.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Yn cadw...",
"Encryption" => "Amgryptiad"
);

1
apps/files_encryption/l10n/da.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Gemmer...",
"Encryption" => "Kryptering"
);

1
apps/files_encryption/l10n/de.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Speichern...",
"Encryption" => "Verschlüsselung"
);

8
apps/files_encryption/l10n/de_DE.php
View File

@ -1,3 +1,9 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Verschlüsselung"
"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
"Saving..." => "Speichern...",
"Encryption" => "Verschlüsselung",
"Enabled" => "Aktiviert",
"Disabled" => "Deaktiviert",
"Change Password" => "Passwort ändern"
);

1
apps/files_encryption/l10n/el.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Γίνεται αποθήκευση...",
"Encryption" => "Κρυπτογράφηση"
);

1
apps/files_encryption/l10n/eo.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Konservante...",
"Encryption" => "Ĉifrado"
);

1
apps/files_encryption/l10n/es.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Guardando...",
"Encryption" => "Cifrado"
);

1
apps/files_encryption/l10n/es_AR.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Guardando...",
"Encryption" => "Encriptación"
);

1
apps/files_encryption/l10n/et_EE.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Salvestamine...",
"Encryption" => "Krüpteerimine"
);

1
apps/files_encryption/l10n/eu.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Gordetzen...",
"Encryption" => "Enkriptazioa"
);

1
apps/files_encryption/l10n/fa.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "در حال ذخیره سازی...",
"Encryption" => "رمزگذاری"
);

8
apps/files_encryption/l10n/fi_FI.php
View File

@ -1,3 +1,9 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Salaus"
"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
"Saving..." => "Tallennetaan...",
"Encryption" => "Salaus",
"Enabled" => "Käytössä",
"Disabled" => "Ei käytössä",
"Change Password" => "Vaihda salasana"
);

1
apps/files_encryption/l10n/fr.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Enregistrement...",
"Encryption" => "Chiffrement"
);

19
apps/files_encryption/l10n/gl.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifrado"
"Recovery key successfully " => "O contrasinal foi recuperado satisfactoriamente",
"Could not " => "Non foi posíbel",
"Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
"Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
"Saving..." => "Gardando...",
"Encryption" => "Cifrado",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
"Recovery account password" => "Recuperación do contrasinal da conta",
"Enabled" => "Activado",
"Disabled" => "Desactivado",
"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
"New Recovery account password" => "Novo contrasinal de recuperación da conta",
"Change Password" => "Cambiar o contrasinal",
"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal",
"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
);

1
apps/files_encryption/l10n/he.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "שמירה…",
"Encryption" => "הצפנה"
);

3
apps/files_encryption/l10n/hr.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Spremanje..."
);

1
apps/files_encryption/l10n/hu_HU.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Mentés...",
"Encryption" => "Titkosítás"
);

1
apps/files_encryption/l10n/id.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Menyimpan...",
"Encryption" => "Enkripsi"
);

1
apps/files_encryption/l10n/is.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Er að vista ...",
"Encryption" => "Dulkóðun"
);

19
apps/files_encryption/l10n/it.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifratura"
"Recovery key successfully " => "Chiave ripristinata correttamente",
"Could not " => "Impossibile",
"Password successfully changed." => "Password modificata correttamente.",
"Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
"Saving..." => "Salvataggio in corso...",
"Encryption" => "Cifratura",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
"Recovery account password" => "Password di ripristino dell'account",
"Enabled" => "Abilitata",
"Disabled" => "Disabilitata",
"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
"Old Recovery account password" => "Vecchia password di ripristino dell'account",
"New Recovery account password" => "Nuova password di ripristino dell'account",
"Change Password" => "Modifica password",
"Enable password recovery by sharing all files with your administrator:" => "Abilita il ripristino della password condividendo tutti i file con l'amministratore:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "L'abilitazione di questa opzione ti consentirà di ottenere nuovamente accesso ai tuoi file cifrati in caso di smarrimento della password",
"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
);

19
apps/files_encryption/l10n/ja_JP.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "暗号化"
"Recovery key successfully " => "鍵を復旧することができました。",
"Could not " => "できませんでした。",
"Password successfully changed." => "パスワードを変更できました。",
"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
"Saving..." => "保存中...",
"Encryption" => "暗号化",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
"Recovery account password" => "復旧アカウントのパスワード",
"Enabled" => "有効",
"Disabled" => "無効",
"Change encryption passwords recovery key:" => "復旧キーの暗号化パスワードを変更:",
"Old Recovery account password" => "古い復旧アカウントのパスワード",
"New Recovery account password" => "新しい復旧アカウントのパスワード",
"Change Password" => "パスワードを変更",
"Enable password recovery by sharing all files with your administrator:" => "管理者が全ての共有ファイルに対してパスワードによる復旧を有効にする:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。",
"File recovery settings updated" => "ファイル復旧設定が更新されました",
"Could not update file recovery" => "ファイル復旧を更新できませんでした"
);

1
apps/files_encryption/l10n/ka_GE.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "შენახვა...",
"Encryption" => "ენკრიპცია"
);

1
apps/files_encryption/l10n/ko.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "저장 중...",
"Encryption" => "암호화"
);

1
apps/files_encryption/l10n/ku_IQ.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "پاشکه‌وتده‌کات...",
"Encryption" => "نهێنیکردن"
);

3
apps/files_encryption/l10n/lb.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Speicheren..."
);

1
apps/files_encryption/l10n/lt_LT.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Saugoma...",
"Encryption" => "Šifravimas"
);

1
apps/files_encryption/l10n/lv.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Saglabā...",
"Encryption" => "Šifrēšana"
);

1
apps/files_encryption/l10n/mk.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Снимам...",
"Encryption" => "Енкрипција"
);

3
apps/files_encryption/l10n/ms_MY.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Simpan..."
);

1
apps/files_encryption/l10n/nb_NO.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Lagrer...",
"Encryption" => "Kryptering"
);

19
apps/files_encryption/l10n/nl.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Versleuteling"
"Recovery key successfully " => "Sleutelherstel succesvol",
"Could not " => "Kon niet",
"Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
"Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
"Saving..." => "Opslaan",
"Encryption" => "Versleuteling",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
"Recovery account password" => "Herstel account wachtwoord",
"Enabled" => "Geactiveerd",
"Disabled" => "Gedeactiveerd",
"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
"Old Recovery account password" => "Oude herstel account wachtwoord",
"New Recovery account password" => "Nieuwe herstel account wachtwoord",
"Change Password" => "Wijzigen wachtwoord",
"Enable password recovery by sharing all files with your administrator:" => "Activeer wachtwoordherstel door alle bestanden met uw beheerder te delen:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Door deze optie te activeren kunt u toegang tot uw versleutelde bestanden krijgen als u uw wachtwoord kwijt bent",
"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
);

3
apps/files_encryption/l10n/nn_NO.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Lagrar …"
);

3
apps/files_encryption/l10n/oc.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Enregistra..."
);

19
apps/files_encryption/l10n/pl.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Szyfrowanie"
"Recovery key successfully " => "Odzyskanie klucza udane",
"Could not " => "Nie można",
"Password successfully changed." => "Zmiana hasła udana.",
"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
"Saving..." => "Zapisywanie...",
"Encryption" => "Szyfrowanie",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
"Recovery account password" => "Odzyskiwanie hasła konta",
"Enabled" => "Włączone",
"Disabled" => "Wyłączone",
"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
"Old Recovery account password" => "Stare hasło odzyskiwania",
"New Recovery account password" => "Nowe hasło odzyskiwania",
"Change Password" => "Zmień hasło",
"Enable password recovery by sharing all files with your administrator:" => "Włączyć hasło odzyskiwania przez udostępnianie wszystkich plików z administratorem:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
);

19
apps/files_encryption/l10n/pt_BR.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Criptografia"
"Recovery key successfully " => "Recuperação de chave com sucesso",
"Could not " => "Não foi possível",
"Password successfully changed." => "Senha alterada com sucesso.",
"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
"Saving..." => "Salvando...",
"Encryption" => "Criptografia",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
"Recovery account password" => "Recuperar a senha da conta",
"Enabled" => "Habilidado",
"Disabled" => "Desabilitado",
"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
"Old Recovery account password" => "Recuperação de senha de conta antiga",
"New Recovery account password" => "Senha Nova da conta de Recuperação",
"Change Password" => "Trocar Senha",
"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida",
"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
);

1
apps/files_encryption/l10n/pt_PT.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "A guardar...",
"Encryption" => "Encriptação"
);

1
apps/files_encryption/l10n/ro.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Se salvează...",
"Encryption" => "Încriptare"
);

1
apps/files_encryption/l10n/ru.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Сохранение...",
"Encryption" => "Шифрование"
);

3
apps/files_encryption/l10n/ru_RU.php
View File

@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Шифрование",
"None" => "Ни один"
"Saving..." => "Сохранение"
);

1
apps/files_encryption/l10n/si_LK.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "සුරැකෙමින් පවතී...",
"Encryption" => "ගුප්ත කේතනය"
);

1
apps/files_encryption/l10n/sk_SK.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Ukladám...",
"Encryption" => "Šifrovanie"
);

1
apps/files_encryption/l10n/sl.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Poteka shranjevanje ...",
"Encryption" => "Šifriranje"
);

1
apps/files_encryption/l10n/sr.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Чување у току...",
"Encryption" => "Шифровање"
);

1
apps/files_encryption/l10n/sv.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Sparar...",
"Encryption" => "Kryptering"
);

1
apps/files_encryption/l10n/ta_LK.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "சேமிக்கப்படுகிறது...",
"Encryption" => "மறைக்குறியீடு"
);

1
apps/files_encryption/l10n/th_TH.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "กำลังบันทึกข้อมูล...",
"Encryption" => "การเข้ารหัส"
);

1
apps/files_encryption/l10n/tr.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Kaydediliyor...",
"Encryption" => "Şifreleme"
);

1
apps/files_encryption/l10n/ug.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "ساقلاۋاتىدۇ…",
"Encryption" => "شىفىرلاش"
);

1
apps/files_encryption/l10n/uk.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Зберігаю...",
"Encryption" => "Шифрування"
);

1
apps/files_encryption/l10n/vi.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Đang lưu...",
"Encryption" => "Mã hóa"
);

1
apps/files_encryption/l10n/zh_CN.GB2312.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "保存中...",
"Encryption" => "加密"
);

1
apps/files_encryption/l10n/zh_CN.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "保存中",
"Encryption" => "加密"
);

1
apps/files_encryption/l10n/zh_TW.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "儲存中...",
"Encryption" => "加密"
);

43
apps/files_encryption/lib/util.php
View File

@ -442,7 +442,7 @@ class Util {
// If the file uses old
// encryption system
} elseif (Crypt::isLegacyEncryptedContent($this->tail($filePath, 3), $relPath)) {
} elseif ( Crypt::isLegacyEncryptedContent( $data, $relPath ) ) {
$found['legacy'][] = array(
'name' => $file,
@ -699,43 +699,28 @@ class Util {
$relPath = $plainFile['path'];
//relative to /data
$rawPath = $this->userId . '/files/' . $plainFile['path'];
$rawPath = '/'.$this->userId . '/files/' . $plainFile['path'];
// Open plain file handle for binary reading
$plainHandle1 = $this->view->fopen($rawPath, 'rb');
// 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
$plainHandle2 = $this->view->fopen($rawPath . '.plaintmp', 'wb');
// Move plain file to a temporary location
stream_copy_to_stream($plainHandle1, $plainHandle2);
// Close access to original file
// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
// Delete original plain file so we can rename enc file later
$this->view->unlink($rawPath);
$plainHandle = $this->view->fopen( $rawPath, 'rb' );
// Open enc file handle for binary writing, with same filename as original plain file
$encHandle = fopen('crypt://' . $relPath, 'wb');
$encHandle = fopen( 'crypt://' . $relPath.'.tmp', 'wb' );
// Save data from plain stream to new encrypted file via enc stream
// NOTE: Stream{} will be invoked for handling
// the encryption, and should handle all keys
// and their generation etc. automatically
stream_copy_to_stream($plainHandle2, $encHandle);
// Move plain file to a temporary location
$size = stream_copy_to_stream( $plainHandle, $encHandle );
// get file size
$size = $this->view->filesize($rawPath . '.plaintmp');
fclose($encHandle);
// Delete temporary plain copy of file
$this->view->unlink($rawPath . '.plaintmp');
$fakeRoot = $this->view->getRoot();
$this->view->chroot('/'.$this->userId.'/files');
$this->view->rename($relPath . '.tmp', $relPath);
$this->view->chroot($fakeRoot);
// Add the file to the cache
\OC\Files\Filesystem::putFileInfo($plainFile['path'], array(
'encrypted' => true,
'size' => $size,
'unencrypted_size' => $size
));
\OC\Files\Filesystem::putFileInfo( $relPath, array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
}
// Encrypt legacy encrypted files

176
apps/files_encryption/tests/crypt.php
View File

@ -16,14 +16,16 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
/**
* Class Test_Encryption_Crypt
*/
class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
public $userId;
public $pass;
@ -39,12 +41,31 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
public $genPrivateKey;
public $genPublicKey;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
}
function setUp() {
// set user id
\OC_User::setUserId(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
$this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
// set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->dataShort = 'hats';
@ -60,53 +81,29 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view = new \OC_FilesystemView('/');
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
\OC_FileProxy::clearProxies();
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
function testGenerateKey()
{
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
}
function testGenerateKey() {
# TODO: use more accurate (larger) string length for test confirmation
@ -119,8 +116,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @return String
*/
function testGenerateIv()
{
function testGenerateIv() {
$iv = Encryption\Crypt::generateIv();
@ -133,8 +129,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @depends testGenerateIv
*/
function testConcatIv($iv)
{
function testConcatIv($iv) {
$catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
@ -157,7 +152,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
return array(
'iv' => $iv
, 'catfile' => $catFile
,
'catfile' => $catFile
);
}
@ -165,8 +161,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @depends testConcatIv
*/
function testSplitIv($testConcatIv)
{
function testSplitIv($testConcatIv) {
// Split catfile into components
$splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
@ -182,8 +177,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @return string padded
*/
function testAddPadding()
{
function testAddPadding() {
$padded = Encryption\Crypt::addPadding($this->dataLong);
@ -198,8 +192,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @depends testAddPadding
*/
function testRemovePadding($padded)
{
function testRemovePadding($padded) {
$noPadding = Encryption\Crypt::RemovePadding($padded);
@ -207,8 +200,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testEncrypt()
{
function testEncrypt() {
$random = openssl_random_pseudo_bytes(13);
@ -220,8 +212,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testDecrypt()
{
function testDecrypt() {
$random = openssl_random_pseudo_bytes(13);
@ -235,8 +226,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testSymmetricEncryptFileContent()
{
function testSymmetricEncryptFileContent() {
# TODO: search in keyfile for actual content as IV will ensure this test always passes
@ -251,8 +241,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testSymmetricStreamEncryptShortFileContent()
{
function testSymmetricStreamEncryptShortFileContent() {
$filename = 'tmp-' . time() . '.test';
@ -307,8 +296,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
* reassembly of its data
*/
function testSymmetricStreamEncryptLongFileContent()
{
function testSymmetricStreamEncryptLongFileContent() {
// Generate a a random filename
$filename = 'tmp-' . time() . '.test';
@ -339,7 +327,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
//print_r($r);
// Join IVs and their respective data chunks
$e = array($r[0] . $r[1], $r[2] . $r[3], $r[4] . $r[5], $r[6] . $r[7], $r[8] . $r[9], $r[10] . $r[11]); //.$r[11], $r[12].$r[13], $r[14] );
$e = array(
$r[0] . $r[1],
$r[2] . $r[3],
$r[4] . $r[5],
$r[6] . $r[7],
$r[8] . $r[9],
$r[10] . $r[11]
); //.$r[11], $r[12].$r[13], $r[14] );
//print_r($e);
@ -384,8 +379,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @brief Test that data that is read by the crypto stream wrapper
*/
function testSymmetricStreamDecryptShortFileContent()
{
function testSymmetricStreamDecryptShortFileContent() {
$filename = 'tmp-' . time();
@ -412,8 +406,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view->unlink($this->userId . '/files/' . $filename);
}
function testSymmetricStreamDecryptLongFileContent()
{
function testSymmetricStreamDecryptLongFileContent() {
$filename = 'tmp-' . time();
@ -432,8 +425,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view->unlink($this->userId . '/files/' . $filename);
}
function testSymmetricEncryptFileContentKeyfile()
{
function testSymmetricEncryptFileContentKeyfile() {
# TODO: search in keyfile for actual content as IV will ensure this test always passes
@ -448,8 +440,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testIsEncryptedContent()
{
function testIsEncryptedContent() {
$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
@ -461,8 +452,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testMultiKeyEncrypt()
{
function testMultiKeyEncrypt() {
# TODO: search in keyfile for actual content as IV will ensure this test always passes
@ -486,8 +476,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testKeyEncrypt()
{
function testKeyEncrypt() {
// Generate keypair
$pair1 = Encryption\Crypt::createKeypair();
@ -507,8 +496,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @brief test encryption using legacy blowfish method
*/
function testLegacyEncryptShort()
{
function testLegacyEncryptShort() {
$crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
@ -525,8 +513,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptShort
*/
function testLegacyDecryptShort($crypted)
{
function testLegacyDecryptShort($crypted) {
$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
@ -537,8 +524,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @brief test encryption using legacy blowfish method
*/
function testLegacyEncryptLong()
{
function testLegacyEncryptLong() {
$crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
@ -555,8 +541,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptLong
*/
function testLegacyDecryptLong($crypted)
{
function testLegacyDecryptLong($crypted) {
$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
@ -569,8 +554,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test generation of legacy encryption key
* @depends testLegacyDecryptShort
*/
function testLegacyCreateKey()
{
function testLegacyCreateKey() {
// Create encrypted key
$encKey = Encryption\Crypt::legacyCreateKey($this->pass);
@ -589,8 +573,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptLong
*/
function testLegacyKeyRecryptKeyfileEncrypt($crypted)
{
function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
@ -603,8 +586,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testRenameFile()
{
function testRenameFile() {
$filename = 'tmp-' . time();
@ -632,8 +614,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($newFilename);
}
function testMoveFileIntoFolder()
{
function testMoveFileIntoFolder() {
$filename = 'tmp-' . time();
@ -663,8 +644,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($newFolder);
}
function testMoveFolder()
{
function testMoveFolder() {
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -696,11 +676,11 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
// tear down
$view->unlink($newFolder);
$view->unlink('/newfolder');
}
function testChangePassphrase()
{
$filename = 'tmp-' . time();
function testChangePassphrase() {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
@ -733,8 +713,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testViewFilePutAndGetContents()
{
function testViewFilePutAndGetContents() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -765,8 +744,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testTouchExistingFile()
{
function testTouchExistingFile() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -787,8 +765,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testTouchFile()
{
function testTouchFile() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -809,8 +786,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testFopenFile()
{
function testFopenFile() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');

BIN
apps/files_encryption/tests/encryption.key
View File

Binary file not shown.

78
apps/files_encryption/tests/keymanager.php
View File

@ -20,8 +20,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Keymanager
*/
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
public $userId;
public $pass;
@ -33,14 +32,35 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
public $randomKey;
public $dataShort;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// disable file proxy by default
\OC_FileProxy::$enabled = false;
// setup filesystem
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS('admin');
\OC_User::setUserId('admin');
// login admin
$params['uid'] = 'admin';
$params['password'] = 'admin';
OCA\Encryption\Hooks::login($params);
}
function setUp() {
// set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->dataShort = 'hats';
@ -62,44 +82,28 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
\OC_FileProxy::$enabled = true;
\OC_FileProxy::clearProxies();
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
function testGetPrivateKey()
{
public static function tearDownAfterClass() {
\OC_FileProxy::$enabled = true;
}
function testGetPrivateKey() {
$key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
@ -115,8 +119,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
}
function testGetPublicKey()
{
function testGetPublicKey() {
$publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
@ -129,8 +132,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('key', $sslInfo);
}
function testSetFileKey()
{
function testSetFileKey() {
# NOTE: This cannot be tested until we are able to break out
# of the FileSystemView data directory root
@ -163,8 +165,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
}
function testGetUserKeys()
{
function testGetUserKeys() {
$keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
@ -187,8 +188,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('key', $sslInfoPrivate);
}
function testFixPartialFilePath()
{
function testFixPartialFilePath() {
$partFilename = 'testfile.txt.part';
$filename = 'testfile.txt';
@ -202,8 +202,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
}
function testRecursiveDelShareKeys()
{
function testRecursiveDelShareKeys() {
// generate filename
$filename = '/tmp-' . time() . '.txt';
@ -230,7 +229,8 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
$this->assertFalse($this->view->file_exists(
'/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
// enable encryption proxy
$proxyStatus = \OC_FileProxy::$enabled;

2
apps/files_encryption/tests/legacy-encrypted-text.txt
View File

@ -1 +1 @@
«ß• ’tÕ.µ¤—dS@t9 øQJ
ð˜¯5–¡‹Ç¡i›òë³Zg§ESlÁF=<3D>Àªð

563
apps/files_encryption/tests/share.php
View File

File diff suppressed because it is too large Load Diff

66
apps/files_encryption/tests/stream.php
View File

@ -27,6 +27,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
@ -34,8 +35,9 @@ use OCA\Encryption;
* Class Test_Encryption_Stream
* @brief this class provide basic stream tests
*/
class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_STREAM_USER1 = "test-stream-user1";
public $userId;
public $pass;
@ -46,15 +48,27 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
public $dataShort;
public $stateFilesTrashbin;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
}
function setUp() {
// set user id
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
\OC_User::setUserId(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
$this->userId = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
$this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
// init filesystem view
$this->view = new \OC_FilesystemView('/');
@ -62,42 +76,26 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
// init short data
$this->dataShort = 'hats';
// init filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// register encryption file proxy
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
// init filesystem for user
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
// login user
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
// clear all proxies
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
}
function testStreamOptions() {
@ -113,7 +111,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// check if stream is at position zero
$this->assertEquals(0,ftell($handle));
$this->assertEquals(0, ftell($handle));
// set stream options
$this->assertTrue(flock($handle, LOCK_SH));
@ -136,7 +134,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// set stream options
$this->assertTrue(stream_set_blocking($handle,1));
$this->assertTrue(stream_set_blocking($handle, 1));
// tear down
$view->unlink($filename);
@ -155,7 +153,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// set stream options
$this->assertFalse(stream_set_timeout($handle,1));
$this->assertFalse(stream_set_timeout($handle, 1));
// tear down
$view->unlink($filename);
@ -174,7 +172,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// set stream options
$this->assertEquals(0, stream_set_write_buffer($handle,1024));
$this->assertEquals(0, stream_set_write_buffer($handle, 1024));
// tear down
$view->unlink($filename);

178
apps/files_encryption/tests/trashbin.php
View File

@ -28,6 +28,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
@ -35,8 +36,9 @@ use OCA\Encryption;
* Class Test_Encryption_Trashbin
* @brief this class provide basic trashbin app tests
*/
class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
public $userId;
public $pass;
@ -50,15 +52,33 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
public $subfolder;
public $subsubfolder;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
\OC_Hook::clear('OC_Filesystem');
\OC_Hook::clear('OC_User');
// trashbin hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1, true);
}
function setUp() {
// set user id
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
\OC_User::setUserId(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
$this->userId = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
// init filesystem view
$this->view = new \OC_FilesystemView('/');
@ -70,48 +90,26 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->subfolder = '/subfolder1';
$this->subsubfolder = '/subsubfolder1';
\OC_Hook::clear('OC_Filesystem');
\OC_Hook::clear('OC_User');
// init filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// register encryption file proxy
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// trashbin hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
// we want to tests with app files_trashbin enabled
\OC_App::enable('files_trashbin');
// init filesystem for user
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
// login user
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
// clear all proxies
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
}
/**
@ -129,30 +127,40 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertTrue(is_int($cryptedFile));
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// delete file
\OC\FIles\Filesystem::unlink($filename);
// check if file not exists
$this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// get files
$trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
$trashFiles = $this->view->getDirectoryContent(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
$trashFileSuffix = null;
// find created file with timestamp
foreach($trashFiles as $file) {
if(strncmp($file['path'], $filename, strlen($filename))) {
foreach ($trashFiles as $file) {
if (strncmp($file['path'], $filename, strlen($filename))) {
$path_parts = pathinfo($file['name']);
$trashFileSuffix = $path_parts['extension'];
}
@ -162,10 +170,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertNotNull($trashFileSuffix);
// check if key for admin not exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
. '.key.' . $trashFileSuffix));
// check if share key for admin not exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
// return filename for next test
return $filename . '.' . $trashFileSuffix;
@ -182,19 +194,24 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$path_parts = pathinfo($filename);
$trashFileSuffix = $path_parts['extension'];
$timestamp = str_replace('d', '', $trashFileSuffix);
$fileNameWithoutSuffix = str_replace('.'.$trashFileSuffix, '', $filename);
$fileNameWithoutSuffix = str_replace('.' . $trashFileSuffix, '', $filename);
// restore file
$this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
// check if file exists
$this->assertTrue($this->view->file_exists('/admin/files/' . $fileNameWithoutSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $fileNameWithoutSuffix));
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $fileNameWithoutSuffix . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
. $fileNameWithoutSuffix . '.key'));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $fileNameWithoutSuffix . '.admin.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $fileNameWithoutSuffix . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
}
/**
@ -212,44 +229,51 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertTrue(is_int($cryptedFile));
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// delete file
\OC\FIles\Filesystem::unlink($filename);
// check if file not exists
$this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// get files
$trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
$trashFileSuffix = null;
// find created file with timestamp
foreach($trashFiles as $file) {
if(strncmp($file['name'], $filename, strlen($filename)) == 0) {
$path_parts = pathinfo($file['name']);
$trashFileSuffix = $path_parts['extension'];
break;
}
}
$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
. ' WHERE `id`=?');
$result = $query->execute(array($filename))->fetchRow();
// check if we found the file we created
$this->assertNotNull($trashFileSuffix);
$this->assertTrue(is_array($result));
// build suffix
$trashFileSuffix = 'd' . $result['timestamp'];
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
. '.key.' . $trashFileSuffix));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
// get timestamp from file
$timestamp = str_replace('d', '', $trashFileSuffix);
@ -258,13 +282,19 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_trashbin/files/' . $filename . '.' . $trashFileSuffix));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
. $trashFileSuffix));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
. '.key.' . $trashFileSuffix));
// check if share key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
}
}

184
apps/files_encryption/tests/util.php
View File

@ -19,8 +19,10 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Util
*/
class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_UTIL_USER1 = "test-util-user1";
const TEST_ENCRYPTION_UTIL_LEGACY_USER = "test-legacy-user";
public $userId;
public $encryptionDir;
@ -40,16 +42,31 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
public $dataShort;
public $legacyEncryptedData;
public $legacyEncryptedDataKey;
public $lagacyKey;
public $legacyKey;
public $stateFilesTrashbin;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, true);
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
}
function setUp() {
\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
$this->userId = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
// set content for encrypting / decrypting in tests
$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
@ -58,7 +75,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
$this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
$this->lagacyKey = '62829813025828180801';
$this->legacyKey = '30943623843030686906';
$keypair = Encryption\Crypt::createKeypair();
@ -68,43 +85,42 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->publicKeyDir = '/' . 'public-keys';
$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
$this->publicKeyPath =
$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath =
$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
$this->view = new \OC_FilesystemView('/');
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
$this->util = new Encryption\Util($this->view, $this->userId);
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
}
else {
OC_App::disable('files_trashbin');
}
}
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
}
/**
* @brief test that paths set during User construction are correct
*/
function testKeyPaths()
{
function testKeyPaths() {
$util = new Encryption\Util($this->view, $this->userId);
$this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
@ -118,39 +134,37 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
/**
* @brief test setup of encryption directories
*/
function testSetupServerSide()
{
function testSetupServerSide() {
$this->assertEquals(true, $this->util->setupServerSide($this->pass));
}
/**
* @brief test checking whether account is ready for encryption,
*/
function testUserIsReady()
{
function testUserIsReady() {
$this->assertEquals(true, $this->util->ready());
}
/**
* @brief test checking whether account is not ready for encryption,
*/
function testUserIsNotReady()
{
$this->view->unlink($this->publicKeyDir);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
$this->assertFalse(OCA\Encryption\Hooks::login($params));
$this->view->unlink($this->privateKeyPath);
}
// function testUserIsNotReady() {
// $this->view->unlink($this->publicKeyDir);
//
// $params['uid'] = $this->userId;
// $params['password'] = $this->pass;
// $this->assertFalse(OCA\Encryption\Hooks::login($params));
//
// $this->view->unlink($this->privateKeyPath);
// }
/**
* @brief test checking whether account is not ready for encryption,
*/
function testIsLagacyUser()
{
$userView = new \OC_FilesystemView( '/' . $this->userId );
function testIsLegacyUser() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@ -161,19 +175,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
\OC_FileProxy::$enabled = $proxyStatus;
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$util = new Encryption\Util($this->view, $this->userId);
$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$util->setMigrationStatus(0);
$this->assertTrue(OCA\Encryption\Hooks::login($params));
$this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
$this->assertEquals($this->legacyKey, $_SESSION['legacyKey']);
}
function testRecoveryEnabledForUser()
{
function testRecoveryEnabledForUser() {
$util = new Encryption\Util($this->view, $this->userId);
@ -193,10 +206,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
}
function testGetUidAndFilename()
{
function testGetUidAndFilename() {
\OC_User::setUserId('admin');
\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
$filename = 'tmp-' . time() . '.test';
@ -213,9 +225,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
$this->assertEquals('admin', $fileOwnerUid);
$this->assertEquals(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
$this->assertEquals($file, $filename);
$this->view->unlink($this->userId . '/files/' . $filename);
}
function testIsSharedPath() {
@ -227,10 +241,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->util->isSharedPath($path));
}
function testEncryptLagacyFiles()
{
$userView = new \OC_FilesystemView( '/' . $this->userId);
$view = new \OC_FilesystemView( '/' . $this->userId . '/files' );
function testEncryptLegacyFiles() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@ -250,23 +265,23 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
\OC_FileProxy::$enabled = $proxyStatus;
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$util = new Encryption\Util($this->view, $this->userId);
$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$util->setMigrationStatus(0);
$this->assertTrue(OCA\Encryption\Hooks::login($params));
$this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
$this->assertEquals($this->legacyKey, $_SESSION['legacyKey']);
$files = $util->findEncFiles('/' . $this->userId . '/files/');
$files = $util->findEncFiles('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files/');
$this->assertTrue(is_array($files));
$found = false;
foreach($files['encrypted'] as $encryptedFile) {
if($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
foreach ($files['encrypted'] as $encryptedFile) {
if ($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
$found = true;
break;
}
@ -274,4 +289,29 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->assertTrue($found);
}
/**
* @param $user
* @param bool $create
* @param bool $password
*/
public static function loginHelper($user, $create = false, $password = false) {
if ($create) {
\OC_User::createUser($user, $user);
}
if ($password === false) {
$password = $user;
}
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($user);
\OC_User::setUserId($user);
$params['uid'] = $user;
$params['password'] = $password;
OCA\Encryption\Hooks::login($params);
}
}

79
apps/files_encryption/tests/webdav.php
View File

@ -27,6 +27,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
@ -34,8 +35,9 @@ use OCA\Encryption;
* Class Test_Encryption_Webdav
* @brief this class provide basic webdav tests for PUT,GET and DELETE
*/
class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_WEBDAV_USER1 = "test-webdav-user1";
public $userId;
public $pass;
@ -46,15 +48,33 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
public $dataShort;
public $stateFilesTrashbin;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
}
function setUp() {
// reset backend
\OC_User::useBackend('database');
// set user id
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
\OC_User::setUserId(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
$this->userId = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
$this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
// init filesystem view
$this->view = new \OC_FilesystemView('/');
@ -62,42 +82,29 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
// init short data
$this->dataShort = 'hats';
// init filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// register encryption file proxy
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
// init filesystem for user
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
// login user
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
// clear all proxies
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
}
/**
@ -125,10 +132,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
// check if key-file was created
$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
// check if shareKey-file was created
$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@ -194,10 +203,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
// check if key-file was removed
$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
$this->assertFalse($this->view->file_exists(
'/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
// check if shareKey-file was removed
$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
$this->assertFalse($this->view->file_exists(
'/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
}
/**
@ -229,7 +240,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
// And off we go!
if($body) {
if ($body) {
$server->httpRequest->setBody($body);
}

4
apps/user_ldap/l10n/hu_HU.php
View File

@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
"Failed to clear the mappings." => "Nem sikerült törölni a hozzárendeléseket.",
"Failed to delete the server configuration" => "Nem sikerült törölni a kiszolgáló konfigurációját",
"The configuration is valid and the connection could be established!" => "A konfiguráció érvényes, és a kapcsolat létrehozható!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
@ -7,6 +8,8 @@
"Take over settings from recent server configuration?" => "Vegyük át a beállításokat az előző konfigurációból?",
"Keep settings?" => "Tartsuk meg a beállításokat?",
"Cannot add server configuration" => "Az új kiszolgáló konfigurációja nem hozható létre",
"mappings cleared" => "Töröltük a hozzárendeléseket",
"Success" => "Sikeres végrehajtás",
"Error" => "Hiba",
"Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
@ -71,6 +74,7 @@
"Email Field" => "Email mező",
"User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
"Internal Username" => "Belső felhasználónév",
"Test Configuration" => "A beállítások tesztelése",
"Help" => "Súgó"
);

1
core/l10n/de_DE.php
View File

@ -46,6 +46,7 @@
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
"Cancel" => "Abbrechen",
"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",

1
core/l10n/hu_HU.php
View File

@ -46,6 +46,7 @@
"years ago" => "több éve",
"Choose" => "Válasszon",
"Cancel" => "Mégsem",
"Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
"Yes" => "Igen",
"No" => "Nem",
"Ok" => "Ok",

1
core/l10n/nl.php
View File

@ -46,6 +46,7 @@
"years ago" => "jaar geleden",
"Choose" => "Kies",
"Cancel" => "Annuleer",
"Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
"Yes" => "Ja",
"No" => "Nee",
"Ok" => "Ok",

1
core/l10n/zh_CN.php
View File

@ -46,6 +46,7 @@
"years ago" => "年前",
"Choose" => "选择(&C)...",
"Cancel" => "取消",
"Error loading file picker template" => "加载文件选择器模板出错",
"Yes" => "是",
"No" => "否",
"Ok" => "好",

4
l10n/af_ZA/core.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"

4
l10n/af_ZA/lib.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-27 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/core.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/files.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

6
l10n/ar/files_encryption.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@ -35,7 +35,7 @@ msgstr ""
#: js/settings-admin.js:11
msgid "Saving..."
msgstr ""
msgstr "جاري الحفظ..."
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"

4
l10n/ar/files_external.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/files_sharing.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/files_trashbin.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/lib.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-27 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/settings.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/ar/user_ldap.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/core.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/files.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

6
l10n/bg_BG/files_encryption.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@ -35,7 +35,7 @@ msgstr ""
#: js/settings-admin.js:11
msgid "Saving..."
msgstr ""
msgstr "Записване..."
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"

4
l10n/bg_BG/files_external.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/files_sharing.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/files_trashbin.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/lib.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-27 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/settings.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bg_BG/user_ldap.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"

4
l10n/bn_BD/core.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-27 02:01+0200\n"
"PO-Revision-Date: 2013-05-26 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"

4
l10n/bn_BD/files.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"

6
l10n/bn_BD/files_encryption.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@ -35,7 +35,7 @@ msgstr ""
#: js/settings-admin.js:11
msgid "Saving..."
msgstr ""
msgstr "সংরক্ষণ করা হচ্ছে.."
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"

4
l10n/bn_BD/files_external.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"

4
l10n/bn_BD/files_sharing.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"

4
l10n/bn_BD/files_trashbin.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"POT-Creation-Date: 2013-05-27 02:00+0200\n"
"PO-Revision-Date: 2013-05-26 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"

Some files were not shown because too many files have changed in this diff Show More