README 外链图片转存 OSS
This commit is contained in:
@@ -1,11 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -pl vibemake-import -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar "$@"
|
||||
exec python3 scripts/java-with-env.py -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar "$@"
|
||||
|
||||
Executable
+39
@@ -0,0 +1,39 @@
|
||||
#!/usr/bin/env python3
|
||||
"""读取 dotenv 字面量并启动 Java,不将配置交给 shell 求值。"""
|
||||
import os
|
||||
import pathlib
|
||||
import re
|
||||
import sys
|
||||
|
||||
|
||||
def load_environment(path, inherited):
|
||||
values = dict(inherited)
|
||||
if path.exists():
|
||||
for number, line in enumerate(path.read_text(encoding="utf-8-sig").splitlines(), 1):
|
||||
if not line.strip() or line.lstrip().startswith("#"):
|
||||
continue
|
||||
match = re.fullmatch(r"\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=(.*)", line)
|
||||
if not match:
|
||||
raise ValueError(f"环境文件第 {number} 行格式不合法")
|
||||
value = match[2].strip()
|
||||
if value[:1] in ("'", '"'):
|
||||
if len(value) < 2 or value[-1] != value[0]:
|
||||
raise ValueError(f"环境文件第 {number} 行引号未闭合")
|
||||
value = value[1:-1]
|
||||
else:
|
||||
value = re.split(r"\s+#", value, maxsplit=1)[0].rstrip()
|
||||
values[match[1]] = value
|
||||
return values
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
root = pathlib.Path(__file__).resolve().parent.parent
|
||||
environment = load_environment(pathlib.Path(os.environ.get("VIBEMAKE_ENV_FILE", root / ".env")), os.environ)
|
||||
if len(sys.argv) < 2:
|
||||
raise ValueError("缺少 Java 启动参数")
|
||||
os.execvpe("java", ["java", *sys.argv[1:]], environment)
|
||||
except (ValueError, OSError) as error:
|
||||
# 不回显配置内容或底层异常文本。
|
||||
print(f"Java 启动失败 type={type(error).__name__}", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
@@ -1,14 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -pl vibemake-import -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 \
|
||||
exec python3 scripts/java-with-env.py -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 \
|
||||
-Dlogging.level.root=WARN -Dlogging.level.org.springframework.jdbc=INFO \
|
||||
-Dlogging.level.org.apache.http=WARN -Ddebug=false \
|
||||
-jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar covers "$@"
|
||||
|
||||
Executable
+9
@@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -pl vibemake-import -am -DskipTests package
|
||||
exec python3 scripts/java-with-env.py -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 \
|
||||
-Dlogging.level.root=WARN -Dlogging.level.org.springframework.jdbc=INFO \
|
||||
-Dlogging.level.org.apache.http=WARN -Dlogging.level.com.aliyun.oss=OFF -Ddebug=false \
|
||||
-jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar readme-images "$@"
|
||||
@@ -0,0 +1,28 @@
|
||||
import importlib.util
|
||||
import pathlib
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
SPEC = importlib.util.spec_from_file_location("java_with_env", pathlib.Path(__file__).parents[1] / "java-with-env.py")
|
||||
MODULE = importlib.util.module_from_spec(SPEC)
|
||||
SPEC.loader.exec_module(MODULE)
|
||||
|
||||
|
||||
class EnvironmentTest(unittest.TestCase):
|
||||
def test_literals_preserve_jdbc_ampersands_and_never_execute_shell(self):
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
path = pathlib.Path(directory) / ".env"
|
||||
path.write_text("DB_URL=jdbc:mysql://example/db?a=1&b=2\nDB_PASSWORD='literal$(command)`text`'\nEMPTY=\n")
|
||||
values = MODULE.load_environment(path, {"DB_PASSWORD": "inherited", "KEEP": "yes"})
|
||||
self.assertEqual(values["DB_URL"], "jdbc:mysql://example/db?a=1&b=2")
|
||||
self.assertEqual(values["DB_PASSWORD"], "literal$(command)`text`")
|
||||
self.assertEqual(values["KEEP"], "yes")
|
||||
self.assertEqual(values["EMPTY"], "")
|
||||
|
||||
def test_invalid_lines_are_rejected_without_echoing_secrets(self):
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
path = pathlib.Path(directory) / ".env"
|
||||
path.write_text("PASSWORD='secret\n")
|
||||
with self.assertRaisesRegex(ValueError, "第 1 行") as caught:
|
||||
MODULE.load_environment(path, {})
|
||||
self.assertNotIn("secret", str(caught.exception))
|
||||
Reference in New Issue
Block a user