Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions scripts/ensure-test-singlestore-cluster-password.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ echo "Setting up SSL"
docker exec ${CONTAINER_NAME} memsqlctl update-config --yes --all --key ssl_ca --value /test-ssl/ca-cert.pem
docker exec ${CONTAINER_NAME} memsqlctl update-config --yes --all --key ssl_cert --value /test-ssl/server-cert.pem
docker exec ${CONTAINER_NAME} memsqlctl update-config --yes --all --key ssl_key --value /test-ssl/server-key.pem
if dpkg --compare-versions "$VERSION" ge "9.0"; then
docker exec ${CONTAINER_NAME} memsqlctl update-config --yes --all --key ssl_ca_for_client_cert --value /test-ssl/ca-cert.pem
fi
echo "Setting up JWT"
docker exec ${CONTAINER_NAME} memsqlctl update-config --yes --all --key jwt_auth_config_file --value /test-jwt/jwt_auth_config.json
echo "Restarting cluster"
Expand Down Expand Up @@ -146,6 +149,9 @@ fi
mysql -u root -h 127.0.0.1 -P 5506 -p"${ROOT_PASSWORD}" -e 'create database if not exists test'

# setup PAM for tests

docker exec -u 0 "$CONTAINER_NAME" sh -lc 'yum -y install pam pam-libs bash && yum clean all'

docker exec ${CONTAINER_NAME} bash -c 'printf "read password
[ \"\$PAM_USER\" == \"%s\" ] || exit 1
[ \"\$password\" == \"%s\" ] || exit 1
Expand Down
14 changes: 2 additions & 12 deletions src/main/java/com/singlestore/jdbc/message/ClientMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ public interface ClientMessage {
static boolean validateLocalFileName(
String sql, Parameters parameters, String fileName, Context context) {
String reg =
"^((\\s[--]|#).*(\\r"
+ "\\n"
+ "|\\r"
+ "|\\n"
+ ")|\\s*/\\*([^*]|\\*[^/])*\\*/|.)*\\s*LOAD\\s+(DATA\\s+)?LOCAL\\s+INFILE\\s+'"
"LOAD\\s+(DATA\\s+)?LOCAL\\s+INFILE\\s+'"
+ Pattern.quote(fileName.replace("\\", "\\\\"))
+ "'";

Expand All @@ -59,13 +55,7 @@ static boolean validateLocalFileName(

if (parameters != null) {
pattern =
Pattern.compile(
"^((\\s[--]|#).*(\\r"
+ "\\n"
+ "|\\r"
+ "|\\n"
+ ")|\\s*/\\*([^*]|\\*[^/])*\\*/|.)*\\s*LOAD\\s+(DATA\\s+)?LOCAL\\s+INFILE\\s+\\?",
Pattern.CASE_INSENSITIVE);
Pattern.compile("LOAD\\s+(DATA\\s+)?LOCAL\\s+INFILE\\s+\\?", Pattern.CASE_INSENSITIVE);
if (pattern.matcher(sql).find() && parameters.size() > 0) {
String paramString = parameters.get(0).bestEffortStringValue(context);
if (paramString != null) {
Expand Down
Loading