Skip to content

Commit 04b7305

Browse files
authored
Merge branch 'main' into update-supported-enterprise-server-versions
2 parents e74e30b + 2847b7f commit 04b7305

File tree

6 files changed

+61
-6
lines changed

6 files changed

+61
-6
lines changed

lib/init-action.js

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/start-proxy.js

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/start-proxy.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/init-action.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,8 +587,11 @@ async function run() {
587587
core.exportVariable(bmnVar, value);
588588
}
589589

590-
// Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for rust
591-
if (config.languages.includes(Language.rust)) {
590+
// For rust: set CODEQL_ENABLE_EXPERIMENTAL_FEATURES, unless codeql already supports rust without it
591+
if (
592+
config.languages.includes(Language.rust) &&
593+
!(await codeql.resolveLanguages()).rust
594+
) {
592595
const feat = Feature.RustAnalysis;
593596
const minVer = featureConfig[feat].minimumVersion as string;
594597
const envVar = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES";

src/start-proxy.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as core from "@actions/core";
2+
13
import { parseLanguage, Language } from "./languages";
24
import { Logger } from "./logging";
35
import { ConfigurationError } from "./util";
@@ -63,6 +65,14 @@ export function getCredentials(
6365

6466
const out: Credential[] = [];
6567
for (const e of parsed) {
68+
// Mask credentials to reduce chance of accidental leakage in logs.
69+
if (e.password !== undefined) {
70+
core.setSecret(e.password);
71+
}
72+
if (e.token !== undefined) {
73+
core.setSecret(e.token);
74+
}
75+
6676
if (e.url === undefined && e.host === undefined) {
6777
// The proxy needs one of these to work. If both are defined, the url has the precedence.
6878
throw new ConfigurationError(

0 commit comments

Comments
 (0)