Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5107_ghidracadabra_PR-7106_gemesa_bsim-ctl-changeauth-pki'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-11-12 10:14:37 -05:00
commit ce7f3ec0b4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/BSim/src/main/help/help/topics/BSim/CommandLineReference.html
View File

@ -185,6 +185,13 @@
authentication. This command does not affect the presence or absence of passwords
or Distinguished Names for existing users.</P>
<P><SPAN class="command"><STRONG>--cafile&nbsp;</STRONG></SPAN><SPAN class=
"emphasis"><EM>&lt;/cafile-path&gt;</EM></SPAN> - specifies an absolute path to a
certificate authority file and is required for <SPAN class=
"command"><STRONG>--auth&nbsp;pki</STRONG></SPAN>. This file should contain the
certificates the PostgreSQL server will use to authenticate in PEM format
concatenated together.</P>
<P><SPAN class="command"><STRONG>--dn&nbsp;</STRONG></SPAN><SPAN class=
"emphasis"><EM>&lt;distinguished-name&gt;</EM></SPAN> - specifies the Distinguished Name for the admin
user and is required for <SPAN class="command"><STRONG>--auth&nbsp;pki</STRONG></SPAN>.</P>

4
Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/BSimControlLaunchable.java
View File

@ -97,7 +97,7 @@ public class BSimControlLaunchable implements GhidraLaunchable {
Set.of(DN_OPTION);
private static final Set<String> DROPUSER_OPTIONS = Set.of();
private static final Set<String> CHANGEAUTH_OPTIONS = Set.of(
AUTH_OPTION, NO_LOCAL_AUTH_OPTION, CAFILE_OPTION);
AUTH_OPTION, DN_OPTION, NO_LOCAL_AUTH_OPTION, CAFILE_OPTION);
//@formatter:on
private static final Map<String, Set<String>> ALLOWED_OPTION_MAP = new HashMap<>();
@ -1435,7 +1435,7 @@ public class BSimControlLaunchable implements GhidraLaunchable {
" stop </datadir-path> [--force]\n" +
" adduser </datadir-path> <username> [--dn \"<distinguished-name>\"]\n" +
" dropuser </datadir-path> <username>\n" +
" changeauth </datadir-path> [--auth|-a pki|password|trust] [--noLocalAuth] [--cafile \"</cacert-path>\"]\n" +
" changeauth </datadir-path> [--auth|-a pki|password|trust] [--noLocalAuth] [--cafile \"</cacert-path>\"] [--dn \"<distinguished-name>\"]\n" +
" resetpassword <username>\n" +
" changeprivilege <username> admin|user\n" +
"\n" +