summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php1
-rw-r--r--lib/l10n/ast.js4
-rw-r--r--lib/l10n/ast.json4
-rw-r--r--lib/l10n/sv.js26
-rw-r--r--lib/l10n/sv.json26
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php3
-rw-r--r--lib/private/Repair.php5
-rw-r--r--lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php110
-rw-r--r--lib/private/Security/IdentityProof/Manager.php56
10 files changed, 197 insertions, 39 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 9d2cb485faf..e99f7efd57a 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -757,6 +757,7 @@ return array(
'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
'OC\\Repair\\NC12\\InstallCoreBundle' => $baseDir . '/lib/private/Repair/NC12/InstallCoreBundle.php',
'OC\\Repair\\NC12\\UpdateLanguageCodes' => $baseDir . '/lib/private/Repair/NC12/UpdateLanguageCodes.php',
+ 'OC\\Repair\\NC13\\RepairIdentityProofKeyFolders' => $baseDir . '/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php',
'OC\\Repair\\NC13\\RepairInvalidPaths' => $baseDir . '/lib/private/Repair/NC13/RepairInvalidPaths.php',
'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php',
'OC\\Repair\\Owncloud\\DropAccountTermsTable' => $baseDir . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 4617b344539..92260f83cb9 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -787,6 +787,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
'OC\\Repair\\NC12\\InstallCoreBundle' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/InstallCoreBundle.php',
'OC\\Repair\\NC12\\UpdateLanguageCodes' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/UpdateLanguageCodes.php',
+ 'OC\\Repair\\NC13\\RepairIdentityProofKeyFolders' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php',
'OC\\Repair\\NC13\\RepairInvalidPaths' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/RepairInvalidPaths.php',
'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php',
'OC\\Repair\\Owncloud\\DropAccountTermsTable' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php',
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 043065241b7..ab4fc13e5b8 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -86,7 +86,11 @@ OC.L10N.register(
"Sharing %s failed, because resharing is not allowed" : "Compartir %s falló, porque nun se permite la re-compartición",
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartir %s falló porque'l motor compartíu pa %s podría nun atopar el so orixe",
"Sharing %s failed, because the file could not be found in the file cache" : "Compartir %s falló, yá que'l ficheru nun pudo atopase na caché de ficheru",
+ "Can’t increase permissions of %s" : "Nun pue aumentase los permisos de %s",
+ "Files can’t be shared with delete permissions" : "Los ficheros nun puen compartise colos permisos de desaniciu",
+ "Files can’t be shared with create permissions" : "Los ficheros nun puen compartise colos permisos de creación",
"Expiration date is in the past" : "La data de caducidá ta nel pasáu.",
+ "Can’t set expiration date more than %s days in the future" : "Nun pue afitase la data de caducidá más de %s díes nel futuru",
"%s shared »%s« with you" : "%s compartió »%s« contigo",
"%s via %s" : "%s via %s",
"Could not find category \"%s\"" : "Nun pudo alcontrase la estaya \"%s.\"",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index df4908d555c..3ee77992faf 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -84,7 +84,11 @@
"Sharing %s failed, because resharing is not allowed" : "Compartir %s falló, porque nun se permite la re-compartición",
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartir %s falló porque'l motor compartíu pa %s podría nun atopar el so orixe",
"Sharing %s failed, because the file could not be found in the file cache" : "Compartir %s falló, yá que'l ficheru nun pudo atopase na caché de ficheru",
+ "Can’t increase permissions of %s" : "Nun pue aumentase los permisos de %s",
+ "Files can’t be shared with delete permissions" : "Los ficheros nun puen compartise colos permisos de desaniciu",
+ "Files can’t be shared with create permissions" : "Los ficheros nun puen compartise colos permisos de creación",
"Expiration date is in the past" : "La data de caducidá ta nel pasáu.",
+ "Can’t set expiration date more than %s days in the future" : "Nun pue afitase la data de caducidá más de %s díes nel futuru",
"%s shared »%s« with you" : "%s compartió »%s« contigo",
"%s via %s" : "%s via %s",
"Could not find category \"%s\"" : "Nun pudo alcontrase la estaya \"%s.\"",
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
index efc92097f83..d8a82647a4b 100644
--- a/lib/l10n/sv.js
+++ b/lib/l10n/sv.js
@@ -29,7 +29,7 @@ OC.L10N.register(
"Server version %s or lower is required." : "Serverversion %s eller äldre krävs.",
"Unknown filetype" : "Okänd filtyp",
"Invalid image" : "Ogiltig bild",
- "Avatar image is not square" : "Profilbilden är inte fyrkantig/kvadrat",
+ "Avatar image is not square" : "Profilbilden är inte fyrkantig",
"today" : "i dag",
"yesterday" : "i går",
"_%n day ago_::_%n days ago_" : ["%n dag sedan","%n dagar sedan"],
@@ -44,7 +44,7 @@ OC.L10N.register(
"File name is a reserved word" : "Filnamnet är ett reserverat ord",
"File name contains at least one invalid character" : "Filnamnet innehåller minst ett ogiltigt tecken",
"File name is too long" : "Filnamnet är för långt",
- "Dot files are not allowed" : "Dot filer är inte tillåtna",
+ "Dot files are not allowed" : "Dot-filer är inte tillåtna",
"Empty filename is not allowed" : "Tomma filnamn är inte tillåtna",
"App \"%s\" cannot be installed because appinfo file cannot be read." : "Applikationen \"%s\" kan ej installeras eftersom informationen från appen ej kunde läsas.",
"App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Applikationen \"%s\" kan ej installeras eftersom den inte är kompatibel med denna serverversion.",
@@ -75,10 +75,10 @@ OC.L10N.register(
"%s you may not use dots in the database name" : "%s du får inte använda punkter i databasnamnet",
"Oracle connection could not be established" : "Oracle-anslutning kunde inte etableras",
"Oracle username and/or password not valid" : "Oracle-användarnamnet och/eller lösenordet är felaktigt",
- "DB Error: \"%s\"" : "DB fel: \"%s\"",
+ "DB Error: \"%s\"" : "DB-fel: \"%s\"",
"Offending command was: \"%s\"" : "Det felaktiga kommandot var: \"%s\"",
"You need to enter details of an existing account." : "Du måste ange inloggningsuppgifter av ett aktuellt konto.",
- "Offending command was: \"%s\", name: %s, password: %s" : "Det felande kommandot var: \"%s\", name: %s, password: %s",
+ "Offending command was: \"%s\", name: %s, password: %s" : "Det felande kommandot var: \"%s\", namn: %s, lösenord: %s",
"PostgreSQL username and/or password not valid" : "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
"For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
@@ -87,7 +87,7 @@ OC.L10N.register(
"Set an admin username." : "Ange ett användarnamn för administratören.",
"Set an admin password." : "Ange ett administratörslösenord.",
"Can't create or write into the data directory %s" : "Kan inte skapa eller skriva till data-katalogen %s",
- "Invalid Federated Cloud ID" : "Ogiltigt Federarat Moln-ID",
+ "Invalid Federated Cloud ID" : "Ogiltigt Federerat Moln-ID",
"Sharing %s failed, because the backend does not allow shares from type %i" : "Misslyckades dela ut %s då backend inte tillåter delningar från typ %i",
"Sharing %s failed, because the file does not exist" : "Delning av %s misslyckades på grund av att filen inte existerar",
"You are not allowed to share %s" : "Du har inte rätt att dela %s",
@@ -193,13 +193,13 @@ OC.L10N.register(
"Cannot write into \"apps\" directory" : "Kan inte skriva till \"apps\" katalogen!",
"This can usually be fixed by giving the webserver write access to the apps directory or disabling the appstore in the config file. See %s" : "Detta kan vanligtvis fixas genom att ge webbservern skrivåtkomst till mappen för appar eller genom att avaktivera App store i konfigurationsfilen. Se %s",
"Cannot create \"data\" directory" : "Kan inte skapa \"datamapp\"",
- "This can usually be fixed by giving the webserver write access to the root directory. See %s" : "Detta kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rootkatalogen. Se %s",
- "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s." : "Rättigheter kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rootkatalogen. Se %s.",
+ "This can usually be fixed by giving the webserver write access to the root directory. See %s" : "Detta kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rotkatalogen. Se %s",
+ "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s." : "Rättigheter kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rotkatalogen. Se %s.",
"Setting locale to %s failed" : "Sätta locale till %s misslyckades",
- "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om dinn webbserver,",
+ "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om din webbserver,",
"Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.",
- "PHP module %s not installed." : "PHP modulen %s är inte installerad.",
- "PHP setting \"%s\" is not set to \"%s\"." : "PHP inställning \"%s\" är inte inställd på \"%s\".",
+ "PHP module %s not installed." : "PHP-modulen %s är inte installerad.",
+ "PHP setting \"%s\" is not set to \"%s\"." : "PHP-inställning \"%s\" är inte inställd på \"%s\".",
"Adjusting this setting in php.ini will make Nextcloud run again" : "Att ändra denna inställning i php.ini kommer göra så att Nextcloud fungerar igen",
"mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload är satt till \"%s\" istället för det förväntade värdet \"0\"",
"To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "För att åtgärda detta problem sätt värdet <code> mbstring.func_overload till </ code> <code> 0 </ code> i din php.ini",
@@ -208,7 +208,7 @@ OC.L10N.register(
"PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställt för att tömma \"inline doc blocks\". Detta kommer att göra flera kärnprogram otillgängliga.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har installerats, men de listas fortfarande som saknade?",
- "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.",
+ "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webbservern.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 krävs",
"Please upgrade your database version" : "Vänligen uppgradera din databas-version",
"Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Vänligen ändra rättigheterna till 0770 så att katalogen inte kan listas utav andra användare.",
@@ -239,10 +239,10 @@ OC.L10N.register(
"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Detta kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till applikationskatalogen %s eller stänga av app-butik i konfigurationsfilen.",
"Cannot create \"data\" directory (%s)" : "Kan inte skapa \"data\" katalog (%s)",
"This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Detta kan vanligtvis åtgärdas genom att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> ge webbserver skrivåtkomst till rotkatalogen </a>.",
- "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rootkatalogen %s.",
+ "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rotkatalogen %s.",
"Data directory (%s) is readable by other users" : "Datakatalogen (%s) kan läsas av andra användare",
"Data directory (%s) must be an absolute path" : "Datakatalogen (%s) måste vara hela sökvägen",
- "Data directory (%s) is invalid" : "Datakatlogen (%s) är ogiltig",
+ "Data directory (%s) is invalid" : "Datamappen (%s) är ogiltig",
"Please check that the data directory contains a file \".ocdata\" in its root." : "Vänligen kontrollera att datakatalogen innehåller filen \".ocdata\" i rooten."
},
"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
index b0f1023484a..99b28d861bd 100644
--- a/lib/l10n/sv.json
+++ b/lib/l10n/sv.json
@@ -27,7 +27,7 @@
"Server version %s or lower is required." : "Serverversion %s eller äldre krävs.",
"Unknown filetype" : "Okänd filtyp",
"Invalid image" : "Ogiltig bild",
- "Avatar image is not square" : "Profilbilden är inte fyrkantig/kvadrat",
+ "Avatar image is not square" : "Profilbilden är inte fyrkantig",
"today" : "i dag",
"yesterday" : "i går",
"_%n day ago_::_%n days ago_" : ["%n dag sedan","%n dagar sedan"],
@@ -42,7 +42,7 @@
"File name is a reserved word" : "Filnamnet är ett reserverat ord",
"File name contains at least one invalid character" : "Filnamnet innehåller minst ett ogiltigt tecken",
"File name is too long" : "Filnamnet är för långt",
- "Dot files are not allowed" : "Dot filer är inte tillåtna",
+ "Dot files are not allowed" : "Dot-filer är inte tillåtna",
"Empty filename is not allowed" : "Tomma filnamn är inte tillåtna",
"App \"%s\" cannot be installed because appinfo file cannot be read." : "Applikationen \"%s\" kan ej installeras eftersom informationen från appen ej kunde läsas.",
"App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Applikationen \"%s\" kan ej installeras eftersom den inte är kompatibel med denna serverversion.",
@@ -73,10 +73,10 @@
"%s you may not use dots in the database name" : "%s du får inte använda punkter i databasnamnet",
"Oracle connection could not be established" : "Oracle-anslutning kunde inte etableras",
"Oracle username and/or password not valid" : "Oracle-användarnamnet och/eller lösenordet är felaktigt",
- "DB Error: \"%s\"" : "DB fel: \"%s\"",
+ "DB Error: \"%s\"" : "DB-fel: \"%s\"",
"Offending command was: \"%s\"" : "Det felaktiga kommandot var: \"%s\"",
"You need to enter details of an existing account." : "Du måste ange inloggningsuppgifter av ett aktuellt konto.",
- "Offending command was: \"%s\", name: %s, password: %s" : "Det felande kommandot var: \"%s\", name: %s, password: %s",
+ "Offending command was: \"%s\", name: %s, password: %s" : "Det felande kommandot var: \"%s\", namn: %s, lösenord: %s",
"PostgreSQL username and/or password not valid" : "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
"For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
@@ -85,7 +85,7 @@
"Set an admin username." : "Ange ett användarnamn för administratören.",
"Set an admin password." : "Ange ett administratörslösenord.",
"Can't create or write into the data directory %s" : "Kan inte skapa eller skriva till data-katalogen %s",
- "Invalid Federated Cloud ID" : "Ogiltigt Federarat Moln-ID",
+ "Invalid Federated Cloud ID" : "Ogiltigt Federerat Moln-ID",
"Sharing %s failed, because the backend does not allow shares from type %i" : "Misslyckades dela ut %s då backend inte tillåter delningar från typ %i",
"Sharing %s failed, because the file does not exist" : "Delning av %s misslyckades på grund av att filen inte existerar",
"You are not allowed to share %s" : "Du har inte rätt att dela %s",
@@ -191,13 +191,13 @@
"Cannot write into \"apps\" directory" : "Kan inte skriva till \"apps\" katalogen!",
"This can usually be fixed by giving the webserver write access to the apps directory or disabling the appstore in the config file. See %s" : "Detta kan vanligtvis fixas genom att ge webbservern skrivåtkomst till mappen för appar eller genom att avaktivera App store i konfigurationsfilen. Se %s",
"Cannot create \"data\" directory" : "Kan inte skapa \"datamapp\"",
- "This can usually be fixed by giving the webserver write access to the root directory. See %s" : "Detta kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rootkatalogen. Se %s",
- "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s." : "Rättigheter kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rootkatalogen. Se %s.",
+ "This can usually be fixed by giving the webserver write access to the root directory. See %s" : "Detta kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rotkatalogen. Se %s",
+ "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s." : "Rättigheter kan vanligtvis fixas genom att ge webbservern skrivåtkomst till rotkatalogen. Se %s.",
"Setting locale to %s failed" : "Sätta locale till %s misslyckades",
- "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om dinn webbserver,",
+ "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om din webbserver,",
"Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.",
- "PHP module %s not installed." : "PHP modulen %s är inte installerad.",
- "PHP setting \"%s\" is not set to \"%s\"." : "PHP inställning \"%s\" är inte inställd på \"%s\".",
+ "PHP module %s not installed." : "PHP-modulen %s är inte installerad.",
+ "PHP setting \"%s\" is not set to \"%s\"." : "PHP-inställning \"%s\" är inte inställd på \"%s\".",
"Adjusting this setting in php.ini will make Nextcloud run again" : "Att ändra denna inställning i php.ini kommer göra så att Nextcloud fungerar igen",
"mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload är satt till \"%s\" istället för det förväntade värdet \"0\"",
"To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "För att åtgärda detta problem sätt värdet <code> mbstring.func_overload till </ code> <code> 0 </ code> i din php.ini",
@@ -206,7 +206,7 @@
"PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställt för att tömma \"inline doc blocks\". Detta kommer att göra flera kärnprogram otillgängliga.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har installerats, men de listas fortfarande som saknade?",
- "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.",
+ "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webbservern.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 krävs",
"Please upgrade your database version" : "Vänligen uppgradera din databas-version",
"Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Vänligen ändra rättigheterna till 0770 så att katalogen inte kan listas utav andra användare.",
@@ -237,10 +237,10 @@
"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Detta kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till applikationskatalogen %s eller stänga av app-butik i konfigurationsfilen.",
"Cannot create \"data\" directory (%s)" : "Kan inte skapa \"data\" katalog (%s)",
"This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Detta kan vanligtvis åtgärdas genom att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> ge webbserver skrivåtkomst till rotkatalogen </a>.",
- "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rootkatalogen %s.",
+ "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rotkatalogen %s.",
"Data directory (%s) is readable by other users" : "Datakatalogen (%s) kan läsas av andra användare",
"Data directory (%s) must be an absolute path" : "Datakatalogen (%s) måste vara hela sökvägen",
- "Data directory (%s) is invalid" : "Datakatlogen (%s) är ogiltig",
+ "Data directory (%s) is invalid" : "Datamappen (%s) är ogiltig",
"Please check that the data directory contains a file \".ocdata\" in its root." : "Vänligen kontrollera att datakatalogen innehåller filen \".ocdata\" i rooten."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index d0c69c3bf32..78400d8082e 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -171,7 +171,8 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
return new \OC\Security\IdentityProof\Manager(
$this->getServer()->query(\OC\Files\AppData\Factory::class),
- $this->getServer()->getCrypto()
+ $this->getServer()->getCrypto(),
+ $this->getServer()->getConfig()
);
});
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 6cfc8ddf4ad..4e9a7cb5cec 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -31,6 +31,7 @@
namespace OC;
use OC\App\AppStore\Bundles\BundleFetcher;
+use OC\Files\AppData\Factory;
use OC\Repair\CleanTags;
use OC\Repair\Collation;
use OC\Repair\MoveUpdaterStepFile;
@@ -39,6 +40,7 @@ use OC\Repair\NC11\FixMountStorages;
use OC\Repair\NC11\MoveAvatars;
use OC\Repair\NC12\InstallCoreBundle;
use OC\Repair\NC12\UpdateLanguageCodes;
+use OC\Repair\NC13\RepairIdentityProofKeyFolders;
use OC\Repair\OldGroupMembershipShares;
use OC\Repair\Owncloud\DropAccountTermsTable;
use OC\Repair\Owncloud\SaveAccountsTableData;
@@ -146,7 +148,8 @@ class Repair implements IOutput{
\OC::$server->getConfig(),
\OC::$server->query(Installer::class)
),
- new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig())
+ new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+ new RepairIdentityProofKeyFolders(\OC::$server->getConfig(), \OC::$server->query(Factory::class), \OC::$server->getRootFolder()),
];
}
diff --git a/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php b/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php
new file mode 100644
index 00000000000..93a135b5cf0
--- /dev/null
+++ b/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\Repair\NC13;
+
+
+use OC\Files\AppData\Factory;
+use OCP\Files\IRootFolder;
+use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class RepairIdentityProofKeyFolders implements IRepairStep {
+
+ /** @var IConfig */
+ private $config;
+
+ /** @var \OC\Files\AppData\AppData */
+ private $appDataIdentityProof;
+
+ /** @var IRootFolder */
+ private $rootFolder;
+
+ /** @var string */
+ private $identityProofDir;
+
+ /**
+ * RepairIdentityProofKeyFolders constructor.
+ *
+ * @param IConfig $config
+ * @param Factory $appDataFactory
+ * @param IRootFolder $rootFolder
+ */
+ public function __construct(IConfig $config, Factory $appDataFactory, IRootFolder $rootFolder) {
+ $this->config = $config;
+ $this->appDataIdentityProof = $appDataFactory->get('identityproof');
+ $this->rootFolder = $rootFolder;
+
+ $instanceId = $this->config->getSystemValue('instanceid', null);
+ if ($instanceId === null) {
+ throw new \RuntimeException('no instance id!');
+ }
+ $this->identityProofDir = 'appdata_' . $instanceId . '/identityproof/';
+ }
+
+ /**
+ * Returns the step's name
+ *
+ * @return string
+ * @since 9.1.0
+ */
+ public function getName() {
+ return "Rename folder with user specific keys";
+ }
+
+ /**
+ * Run repair step.
+ * Must throw exception on error.
+ *
+ * @param IOutput $output
+ * @throws \Exception in case of failure
+ * @since 9.1.0
+ */
+ public function run(IOutput $output) {
+ $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+ if (version_compare($versionFromBeforeUpdate, '13.0.0.1', '<=')) {
+ $count = $this->repair();
+ $output->info('Repaired ' . $count . ' folders');
+ }
+ }
+
+ /**
+ * rename all dirs with user specific keys to 'user-uid'
+ *
+ * @return int
+ */
+ private function repair() {
+ $count = 0;
+ $dirListing = $this->appDataIdentityProof->getDirectoryListing();
+ /** @var ISimpleFolder $folder */
+ foreach ($dirListing as $folder) {
+ $name = $folder->getName();
+ $node = $this->rootFolder->get($this->identityProofDir . $name);
+ $node->move($this->identityProofDir . 'user-' . $name);
+ $count++;
+ }
+
+ return $count;
+ }
+}
diff --git a/lib/private/Security/IdentityProof/Manager.php b/lib/private/Security/IdentityProof/Manager.php
index 73edac5f747..c5134e12b8d 100644
--- a/lib/private/Security/IdentityProof/Manager.php
+++ b/lib/private/Security/IdentityProof/Manager.php
@@ -23,6 +23,7 @@ namespace OC\Security\IdentityProof;
use OC\Files\AppData\Factory;
use OCP\Files\IAppData;
+use OCP\IConfig;
use OCP\IUser;
use OCP\Security\ICrypto;
@@ -31,15 +32,21 @@ class Manager {
private $appData;
/** @var ICrypto */
private $crypto;
+ /** @var IConfig */
+ private $config;
/**
* @param Factory $appDataFactory
* @param ICrypto $crypto
+ * @param IConfig $config
*/
public function __construct(Factory $appDataFactory,
- ICrypto $crypto) {
+ ICrypto $crypto,
+ IConfig $config
+ ) {
$this->appData = $appDataFactory->get('identityproof');
$this->crypto = $crypto;
+ $this->config = $config;
}
/**
@@ -66,20 +73,20 @@ class Manager {
}
/**
- * Generate a key for $user
+ * Generate a key for a given ID
* Note: If a key already exists it will be overwritten
*
- * @param IUser $user
+ * @param string $id key id
* @return Key
*/
- protected function generateKey(IUser $user) {
+ protected function generateKey($id) {
list($publicKey, $privateKey) = $this->generateKeyPair();
// Write the private and public key to the disk
try {
- $this->appData->newFolder($user->getUID());
+ $this->appData->newFolder($id);
} catch (\Exception $e) {}
- $folder = $this->appData->getFolder($user->getUID());
+ $folder = $this->appData->getFolder($id);
$folder->newFile('private')
->putContent($this->crypto->encrypt($privateKey));
$folder->newFile('public')
@@ -89,21 +96,48 @@ class Manager {
}
/**
- * Get public and private key for $user
+ * Get key for a specific id
*
- * @param IUser $user
+ * @param string $id
* @return Key
*/
- public function getKey(IUser $user) {
+ protected function retrieveKey($id) {
try {
- $folder = $this->appData->getFolder($user->getUID());
+ $folder = $this->appData->getFolder($id);
$privateKey = $this->crypto->decrypt(
$folder->getFile('private')->getContent()
);
$publicKey = $folder->getFile('public')->getContent();
return new Key($publicKey, $privateKey);
} catch (\Exception $e) {
- return $this->generateKey($user);
+ return $this->generateKey($id);
+ }
+ }
+
+ /**
+ * Get public and private key for $user
+ *
+ * @param IUser $user
+ * @return Key
+ */
+ public function getKey(IUser $user) {
+ $uid = $user->getUID();
+ return $this->retrieveKey('user-' . $uid);
+ }
+
+ /**
+ * Get instance wide public and private key
+ *
+ * @return Key
+ * @throws \RuntimeException
+ */
+ public function getSystemKey() {
+ $instanceId = $this->config->getSystemValue('instanceid', null);
+ if ($instanceId === null) {
+ throw new \RuntimeException('no instance id!');
}
+ return $this->retrieveKey('system-' . $instanceId);
}
+
+
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 00:22:21 +0000