Skip to content

fixed SELECT INTO OUTFILE PARQUET 9731 #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hnwyllmm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed SELECT INTO OUTFILE PARQUET 9731 #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions src/sql/resolver/ob_resolver_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7644,12 +7644,33 @@ int ObResolverUtils::check_secure_path(const common::ObString &secure_file_priv,
} else {
ObString secure_file_priv_tmp(real_secure_file);
const int64_t pos = secure_file_priv_tmp.length();
#ifdef _WIN32
// Windows: _fullpath() normalizes to drive-rooted paths using '\' as
// the separator (e.g. "C:\", "C:\obdata"). The filesystem is also
// case-insensitive by default, so use a case-insensitive prefix match
// and accept either '\' or '/' as the boundary separator.
const bool is_fs_root =
(secure_file_priv_tmp.length() == 3
&& secure_file_priv_tmp.ptr()[1] == ':'
&& (secure_file_priv_tmp.ptr()[2] == '\\'
|| secure_file_priv_tmp.ptr()[2] == '/'));
const bool prefix_ok = full_path.prefix_match_ci(secure_file_priv_tmp);
const bool boundary_ok =
(full_path.length() > secure_file_priv_tmp.length()
&& (full_path[pos] == '\\' || full_path[pos] == '/'));
#else
const bool is_fs_root = (secure_file_priv_tmp == "/");
const bool prefix_ok = full_path.prefix_match(secure_file_priv_tmp);
const bool boundary_ok =
(full_path.length() > secure_file_priv_tmp.length()
&& full_path[pos] == '/');
#endif
if (full_path.length() < secure_file_priv_tmp.length()) {
ret = OB_ERR_NO_PRIVILEGE;
} else if (!full_path.prefix_match(secure_file_priv_tmp)) {
} else if (!prefix_ok) {
ret = OB_ERR_NO_PRIVILEGE;
} else if (full_path.length() > secure_file_priv_tmp.length()
&& secure_file_priv_tmp != "/" && full_path[pos] != '/') {
&& !is_fs_root && !boundary_ok) {
ret = OB_ERR_NO_PRIVILEGE;
}
}
Expand All @@ -7676,12 +7697,30 @@ int ObResolverUtils::check_secure_path(const common::ObString &secure_file_priv,
} else {
ObString secure_file_path_tmp(real_secure_file);
const int64_t pos = secure_file_path_tmp.length();
#ifdef _WIN32
// See the symmetric comment in the secure_file_priv branch above.
const bool is_fs_root =
(secure_file_path_tmp.length() == 3
&& secure_file_path_tmp.ptr()[1] == ':'
&& (secure_file_path_tmp.ptr()[2] == '\\'
|| secure_file_path_tmp.ptr()[2] == '/'));
const bool prefix_ok = full_path.prefix_match_ci(secure_file_path_tmp);
const bool boundary_ok =
(full_path.length() > secure_file_path_tmp.length()
&& (full_path[pos] == '\\' || full_path[pos] == '/'));
#else
const bool is_fs_root = (secure_file_path_tmp == "/");
const bool prefix_ok = full_path.prefix_match(secure_file_path_tmp);
const bool boundary_ok =
(full_path.length() > secure_file_path_tmp.length()
&& full_path[pos] == '/');
#endif
if (full_path.length() < secure_file_path_tmp.length()) {
// continue
} else if (!full_path.prefix_match(secure_file_path_tmp)) {
} else if (!prefix_ok) {
// continue
} else if (full_path.length() > secure_file_path_tmp.length()
&& secure_file_path_tmp != "/" && full_path[pos] != '/') {
&& !is_fs_root && !boundary_ok) {
// continue
} else {
ret = OB_SUCCESS;
Expand Down
Loading