This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 82c2f4b20 [MINOR] add util for generating random strings (#5143)
82c2f4b20 is described below
commit 82c2f4b201b746e9206bb58ef98f536fc333aa07
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Jul 14 15:29:07 2024 +0100
[MINOR] add util for generating random strings (#5143)
---
LICENSE | 1 +
.../spark/executor/SecureRandomStringUtils.java | 221 +++++++++++++++++++++
.../spark/executor/SparkPythonExecutor.scala | 5 +-
3 files changed, 224 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index c1c8f6f84..e2ef2e897 100644
--- a/LICENSE
+++ b/LICENSE
@@ -241,6 +241,7 @@ The following file are provided under the Apache 2.0
License.
linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/src/main/resources/hbase-ruby/*
linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/src/main/resources/hbase-ruby/*
linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/src/main/resources/hbase-ruby/*
+
linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/executor/SecureRandomStringUtils.java
The files:
.mvn/wrapper/MavenWrapperDownloader.java
diff --git
a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/executor/SecureRandomStringUtils.java
b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/executor/SecureRandomStringUtils.java
new file mode 100644
index 000000000..de5ac0b60
--- /dev/null
+++
b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/executor/SecureRandomStringUtils.java
@@ -0,0 +1,221 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.engineplugin.spark.executor;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * Based on Commons Lang3 RandomStringUtils, but with a SecureRandom.
+ *
+ * <p>For internal Apache Linkis use only.
+ */
+final class SecureRandomStringUtils {
+ // Based on
+ //
https://github.com/apache/commons-lang/blob/5e07d873e6b45714d29bf47634adffa3b5aef098/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
+
+ private static SecureRandom RANDOM_INSTANCE;
+
+ private static SecureRandom random() {
+ if (RANDOM_INSTANCE != null) {
+ return RANDOM_INSTANCE;
+ }
+ try {
+ RANDOM_INSTANCE = SecureRandom.getInstanceStrong();
+ return RANDOM_INSTANCE;
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException("Cannot create
SecureRandom.getInstanceStrong()", e);
+ }
+ }
+
+ // Random
+ /**
+ * Creates a random string whose length is the number of characters
specified.
+ *
+ * <p>Characters will be chosen from the set of Latin alphabetic characters
(a-z, A-Z) and the
+ * digits 0-9.
+ *
+ * @param count the length of random string to create
+ * @return the random string
+ * @throws IllegalArgumentException if {@code count} < 0.
+ */
+ public static String randomAlphanumeric(final int count) {
+ return random(count, true, true);
+ }
+
+ /**
+ * Creates a random string whose length is the number of characters
specified.
+ *
+ * <p>Characters will be chosen from the set of alpha-numeric characters as
indicated by the
+ * arguments.
+ *
+ * @param count the length of random string to create
+ * @param letters if {@code true}, generated string may include alphabetic
characters
+ * @param numbers if {@code true}, generated string may include numeric
characters
+ * @return the random string
+ * @throws IllegalArgumentException if {@code count} < 0.
+ */
+ private static String random(final int count, final boolean letters, final
boolean numbers) {
+ return random(count, 0, 0, letters, numbers);
+ }
+
+ /**
+ * Creates a random string whose length is the number of characters
specified.
+ *
+ * <p>Characters will be chosen from the set of alpha-numeric characters as
indicated by the
+ * arguments.
+ *
+ * @param count the length of random string to create
+ * @param start the position in set of chars to start at
+ * @param end the position in set of chars to end before
+ * @param letters if {@code true}, generated string may include alphabetic
characters
+ * @param numbers if {@code true}, generated string may include numeric
characters
+ * @return the random string
+ * @throws IllegalArgumentException if {@code count} < 0.
+ */
+ private static String random(
+ final int count,
+ final int start,
+ final int end,
+ final boolean letters,
+ final boolean numbers) {
+ return random(count, start, end, letters, numbers, null, random());
+ }
+
+ /**
+ * Creates a random string based on a variety of options, using supplied
source of randomness.
+ *
+ * <p>If start and end are both {@code 0}, start and end are set to {@code '
'} and {@code 'z'},
+ * the ASCII printable characters, will be used, unless letters and numbers
are both {@code
+ * false}, in which case, start and end are set to {@code 0} and {@link
Character#MAX_CODE_POINT}.
+ *
+ * <p>If set is not {@code null}, characters between start and end are
chosen.
+ *
+ * <p>This method accepts a user-supplied {@link SecureRandom} instance to
use as a source of
+ * randomness. By seeding a single {@link SecureRandom} instance with a
fixed seed and using it
+ * for each call, the same random sequence of strings can be generated
repeatedly and predictably.
+ *
+ * @param count the length of random string to create
+ * @param start the position in set of chars to start at (inclusive)
+ * @param end the position in set of chars to end before (exclusive)
+ * @param letters if {@code true}, generated string may include alphabetic
characters
+ * @param numbers if {@code true}, generated string may include numeric
characters
+ * @param chars the set of chars to choose randoms from, must not be empty.
If {@code null}, then
+ * it will use the set of all chars.
+ * @param random a source of randomness.
+ * @return the random string
+ * @throws ArrayIndexOutOfBoundsException if there are not {@code (end -
start) + 1} characters in
+ * the set array.
+ * @throws IllegalArgumentException if {@code count} < 0 or the provided
chars array is empty.
+ */
+ private static String random(
+ int count,
+ int start,
+ int end,
+ final boolean letters,
+ final boolean numbers,
+ final char[] chars,
+ final SecureRandom random) {
+ if (count == 0) {
+ return StringUtils.EMPTY;
+ }
+ if (count < 0) {
+ throw new IllegalArgumentException(
+ "Requested random string length " + count + " is less than 0.");
+ }
+ if (chars != null && chars.length == 0) {
+ throw new IllegalArgumentException("The chars array must not be empty");
+ }
+
+ if (start == 0 && end == 0) {
+ if (chars != null) {
+ end = chars.length;
+ } else if (!letters && !numbers) {
+ end = Character.MAX_CODE_POINT;
+ } else {
+ end = 'z' + 1;
+ start = ' ';
+ }
+ } else if (end <= start) {
+ throw new IllegalArgumentException(
+ "Parameter end (" + end + ") must be greater than start (" + start +
")");
+ }
+
+ final int zeroDigitAscii = 48;
+ final int firstLetterAscii = 65;
+
+ if (chars == null && (numbers && end <= zeroDigitAscii || letters && end
<= firstLetterAscii)) {
+ throw new IllegalArgumentException(
+ "Parameter end ("
+ + end
+ + ") must be greater then ("
+ + zeroDigitAscii
+ + ") for generating digits "
+ + "or greater then ("
+ + firstLetterAscii
+ + ") for generating letters.");
+ }
+
+ final StringBuilder builder = new StringBuilder(count);
+ final int gap = end - start;
+
+ while (count-- != 0) {
+ final int codePoint;
+ if (chars == null) {
+ codePoint = random.nextInt(gap) + start;
+
+ switch (Character.getType(codePoint)) {
+ case Character.UNASSIGNED:
+ case Character.PRIVATE_USE:
+ case Character.SURROGATE:
+ count++;
+ continue;
+ }
+
+ } else {
+ codePoint = chars[random.nextInt(gap) + start];
+ }
+
+ final int numberOfChars = Character.charCount(codePoint);
+ if (count == 0 && numberOfChars > 1) {
+ count++;
+ continue;
+ }
+
+ if (letters && Character.isLetter(codePoint)
+ || numbers && Character.isDigit(codePoint)
+ || !letters && !numbers) {
+ builder.appendCodePoint(codePoint);
+
+ if (numberOfChars == 2) {
+ count--;
+ }
+
+ } else {
+ count++;
+ }
+ }
+ return builder.toString();
+ }
+
+ private SecureRandomStringUtils() {
+ // empty
+ }
+}
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
index 3130ec0d3..14984885c 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
@@ -38,7 +38,7 @@ import
org.apache.linkis.storage.resultset.ResultSetWriterFactory
import org.apache.commons.exec.CommandLine
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang3.{RandomStringUtils, StringUtils}
+import org.apache.commons.lang3.StringUtils
import org.apache.spark.SparkConf
import org.apache.spark.api.java.JavaSparkContext
import org.apache.spark.sql.{DataFrame, SparkSession}
@@ -46,7 +46,6 @@ import org.apache.spark.sql.execution.datasources.csv.UDF
import java.io._
import java.net.InetAddress
-import java.security.SecureRandom
import java.util
import scala.collection.JavaConverters._
@@ -77,7 +76,7 @@ class SparkPythonExecutor(val sparkEngineSession:
SparkEngineSession, val id: In
private val lineOutputStream = new RsOutputStream
val sqlContext = sparkEngineSession.sqlContext
val SUCCESS = "success"
- private lazy val py4jToken: String =
SecureRandom.getInstance("SHA1PRNG").nextInt(100000).toString
+ private lazy val py4jToken: String =
SecureRandomStringUtils.randomAlphanumeric(256)
private lazy val gwBuilder: GatewayServerBuilder = {
val builder = new GatewayServerBuilder()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
