Skip to content

Commit ab67334

Browse files
authored
Merge pull request #1385 from nextcloud/enh/noid/occ-hide-secrets-by-default
Hide provider secrets with 'occ providers'
2 parents 84929af + d3febf7 commit ab67334

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

lib/Command/ListProviders.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use OC\Core\Command\Base;
1212
use OCA\UserOIDC\Db\ProviderMapper;
1313
use OCA\UserOIDC\Service\ProviderService;
14-
use OCP\Security\ICrypto;
1514
use Symfony\Component\Console\Input\InputInterface;
1615
use Symfony\Component\Console\Input\InputOption;
1716
use Symfony\Component\Console\Output\OutputInterface;
@@ -21,7 +20,6 @@ class ListProviders extends Base {
2120
public function __construct(
2221
private ProviderMapper $providerMapper,
2322
private ProviderService $providerService,
24-
private ICrypto $crypto,
2523
) {
2624
parent::__construct();
2725
}
@@ -46,15 +44,14 @@ protected function execute(InputInterface $input, OutputInterface $output) {
4644
$serializedProvider = $provider->jsonSerialize();
4745
if ($sensitive) {
4846
$serializedProvider['clientId'] = '********';
49-
$serializedProvider['clientSecret'] = '********';
5047
try {
5148
$discoveryDomainName = parse_url($serializedProvider['discoveryEndpoint'], PHP_URL_HOST);
5249
$serializedProvider['discoveryEndpoint'] = str_replace($discoveryDomainName, '********', $serializedProvider['discoveryEndpoint']);
5350
} catch (\Exception|\Throwable) {
5451
}
55-
} else {
56-
$serializedProvider['clientSecret'] = $this->crypto->decrypt($provider->getClientSecret());
5752
}
53+
// never show the client secret, it can be changed but not retrieved
54+
$serializedProvider['clientSecret'] = '********';
5855
return array_merge($serializedProvider, ['settings' => $providerSettings]);
5956
}, $providers);
6057

0 commit comments

Comments
 (0)