Skip to content

[stable30] fix(core): Make --password-from-env work with NC_PASS everywhere #53617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 20, 2025
Merged

[stable30] fix(core): Make --password-from-env work with NC_PASS everywhere #53617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc11437
fix(core): Make OC_PASS actually work for occ user:auth-tokens:add --…
provokateurin Jun 20, 2025
76d375d
fix(core): Make --password-from-env work with NC_PASS everywhere
provokateurin Jun 20, 2025
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: 3 additions & 3 deletions core/Command/User/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'password-from-env',
null,
InputOption::VALUE_NONE,
'read password from environment variable OC_PASS'
'read password from environment variable NC_PASS/OC_PASS'
)
->addOption(
'generate-password',
Expand Down Expand Up @@ -91,10 +91,10 @@

// Setup password.
if ($input->getOption('password-from-env')) {
$password = getenv('OC_PASS');
$password = getenv('NC_PASS') ?: getenv('OC_PASS');

Check notice

Code scanning / Psalm

RiskyTruthyFalsyComparison Note

Operand of type false|string contains type string, which can be falsy and truthy. This can cause possibly unexpected behavior. Use strict comparison instead.

if (!$password) {
$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
return 1;
}
} elseif ($input->getOption('generate-password')) {
Expand Down
4 changes: 2 additions & 2 deletions core/Command/User/AuthTokens/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
}

if ($input->getOption('password-from-env')) {
$password = getenv('NC_PASS') ?? getenv('OC_PASS');
$password = getenv('NC_PASS') ?: getenv('OC_PASS');

Check notice

Code scanning / Psalm

RiskyTruthyFalsyComparison Note

Operand of type false|string contains type string, which can be falsy and truthy. This can cause possibly unexpected behavior. Use strict comparison instead.
if (!$password) {
$output->writeln('<error>--password-from-env given, but NC_PASS is empty!</error>');
$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
return 1;
}
} elseif ($input->isInteractive()) {
Expand Down
6 changes: 3 additions & 3 deletions core/Command/User/ResetPassword.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
'password-from-env',
null,
InputOption::VALUE_NONE,
'read password from environment variable OC_PASS'
'read password from environment variable NC_PASS/OC_PASS'
)
;
}
Expand All @@ -56,9 +56,9 @@
}

if ($input->getOption('password-from-env')) {
$password = getenv('OC_PASS');
$password = getenv('NC_PASS') ?: getenv('OC_PASS');

Check notice

Code scanning / Psalm

RiskyTruthyFalsyComparison Note

Operand of type false|string contains type string, which can be falsy and truthy. This can cause possibly unexpected behavior. Use strict comparison instead.
if (!$password) {
$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
return 1;
}
} elseif ($input->isInteractive()) {
Expand Down
Loading