db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-17 01:12:23 +02:00
Code Issues Releases Activity

Use storagePathP() instead of cfgOptionStr() to get base repo path.

Browse Source 
cfgOptionStr() may not have the correct value if the repo is remote.

Use storagePathP() instead since it can ask the remote for the correct value when required.
This commit is contained in:
David Steele
2022-05-19 12:25:58 -04:00
parent c7a66ac1af
commit 69adb990dc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/repo/common.c
View File

@ -6,6 +6,7 @@ Common Functions and Definitions for Repo Commands
#include "command/repo/common.h"
#include "common/debug.h"
#include "config/config.h"
#include "storage/helper.h"
/**********************************************************************************************************************************/
String *
@ -32,8 +33,11 @@ repoPathIsValid(const String *path)
// Validate absolute paths
if (strBeginsWith(path, FSLASH_STR))
{
// Get the repo path using repo storage in case it is remotely configured
const String *const repoPath = storagePathP(storageRepo(), NULL);
// If the path is exactly equal to the repo path then the relative path is empty
if (strEq(path, cfgOptionStr(cfgOptRepoPath)))
if (strEq(path, repoPath))
{
MEM_CONTEXT_PRIOR_BEGIN()
{
@ -44,8 +48,7 @@ repoPathIsValid(const String *path)
// Else check that the file path begins with the repo path
else
{
if (!strEq(cfgOptionStr(cfgOptRepoPath), FSLASH_STR) &&
!strBeginsWith(path, strNewFmt("%s/", strZ(cfgOptionStr(cfgOptRepoPath)))))
if (!strEq(repoPath, FSLASH_STR) && !strBeginsWith(path, strNewFmt("%s/", strZ(repoPath))))
{
THROW_FMT(
ParamInvalidError, "absolute path '%s' is not in base path '%s'", strZ(path),
@ -55,8 +58,7 @@ repoPathIsValid(const String *path)
MEM_CONTEXT_PRIOR_BEGIN()
{
// Get the relative part of the path/file
result = strSub(
path, strEq(cfgOptionStr(cfgOptRepoPath), FSLASH_STR) ? 1 : strSize(cfgOptionStr(cfgOptRepoPath)) + 1);
result = strSub(path, strEq(repoPath, FSLASH_STR) ? 1 : strSize(repoPath) + 1);
}
MEM_CONTEXT_PRIOR_END();
}