hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix external table bugs

Browse Source
This commit is contained in:
wjhh2008
2023-05-10 14:21:03 +00:00
committed by ob-robot
parent 6bb1a8b703
commit f3d62d52ed
11 changed files with 99 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/resolver/dcl/ob_dcl_resolver.cpp
View File

@ -329,10 +329,12 @@ int ObDCLResolver::mask_password_for_users(ObIAllocator *allocator,
return ret;
}
int ObDCLResolver::mask_password_for_passwd_node(ObIAllocator *allocator,
int ObDCLResolver::mask_password_for_passwd_node(
ObIAllocator *allocator,
const common::ObString &src,
const ParseNode *passwd_node,
common::ObString &masked_sql)
common::ObString &masked_sql,
bool skip_enclosed_char)
{
int ret = OB_SUCCESS;
const ObString::obstr_size_t src_len = src.length();
@ -351,9 +353,14 @@ int ObDCLResolver::mask_password_for_passwd_node(ObIAllocator *allocator,
ret = OB_SIZE_OVERFLOW;
LOG_WARN("last column overflow", K(src_len), K(passwd_node->stmt_loc_.last_column_), K(ret));
} else {
uint64_t pwd_len = passwd_node->stmt_loc_.last_column_ -
passwd_node->stmt_loc_.first_column_ + 1;
MEMSET(tmp_sql.ptr() + passwd_node->stmt_loc_.first_column_, password_mask_, pwd_len);
int64_t start_pos = passwd_node->stmt_loc_.first_column_;
int64_t end_pos = passwd_node->stmt_loc_.last_column_ + 1;
if (skip_enclosed_char && end_pos - start_pos >= 2) {
start_pos += 1;
end_pos -= 1;
}
uint64_t pwd_len = end_pos - start_pos;
MEMSET(tmp_sql.ptr() + start_pos, password_mask_, pwd_len);
}
if (OB_SUCC(ret)) {
masked_sql = tmp_sql;
@ -461,4 +468,4 @@ int ObDCLResolver::check_dcl_on_inner_user(const ObItemType &type,
LOG_USER_ERROR(OB_NOT_SUPPORTED, "modify on reserved user");
}
return ret;
}
}

9
src/sql/resolver/dcl/ob_dcl_resolver.h
View File

@ -28,6 +28,11 @@ public:
virtual ~ObDCLResolver()
{
}
static int mask_password_for_passwd_node(ObIAllocator *allocator,
const common::ObString &src,
const ParseNode *passwd_node,
common::ObString &masked_sql,
bool skip_enclosed_char = false);
protected:
int check_and_convert_name(common::ObString &db, common::ObString &table);
int check_password_strength(common::ObString &password, common::ObString &user_name);
@ -57,10 +62,6 @@ protected:
const ParseNode *users,
int64_t pwd_idx,
common::ObString &masked_sql);
static int mask_password_for_passwd_node(ObIAllocator *allocator,
const common::ObString &src,
const ParseNode *passwd_node,
common::ObString &masked_sql);
enum ObPasswordPolicy {LOW = 0, MEDIUM};
static const char password_mask_ = '*';
private: