nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-11-12 07:00:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #136 from nextcloud/enh/128/allow-var-backups

Browse source 
improve setting the backup host location and allow `/var/backups`
This commit is contained in:
Simon L 2022-01-24 12:48:04 +01:00 • committed by GitHub
commit 06283bdf21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
php/src/Data/ConfigurationManager.php
View file

@ -172,14 +172,18 @@ class ConfigurationManager
$isValidPath = false; $isValidPath = false;
foreach($allowedPrefixes as $allowedPrefix) { foreach($allowedPrefixes as $allowedPrefix) {
if(str_starts_with($location, $allowedPrefix)) { if(str_starts_with($location, $allowedPrefix) && !str_ends_with($location, '/')) {
$isValidPath = true;
break;
}
if ($location === '/var/backups') {
$isValidPath = true; $isValidPath = true;
break; break;
} }
} }
if(!$isValidPath) { if(!$isValidPath) {
throw new InvalidSettingConfigurationException("Path must start with /mnt/ or /media/."); throw new InvalidSettingConfigurationException("The path must start with '/mnt/' or '/media/' or be equal to '/var/backups'.");
} }

2
php/templates/containers.twig
View file

@ -167,7 +167,7 @@
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input class="button" type="submit" value="Submit" /> <input class="button" type="submit" value="Submit" />
</form> </form>
The folder path that you enter must start with /mnt/ or /media/ so e.g. /mnt/backup The folder path that you enter must start with <b>/mnt/</b> or <b>/media/</b> or be equal to <b>/var/backups</b>. So e.g. <b>/mnt/backup</b> or <b>/var/backups</b>
{% endif %} {% endif %}
{% if borg_backup_host_location != "" %} {% if borg_backup_host_location != "" %}