1212 */
1313public class Commander {
1414
15+ @ Parameter (description = "This parameter catches all unrecognized arguments." )
16+ private List <String > unknownOptions = new ArrayList <>();
1517 @ Parameter (names = {"-h" , "--help" }, help = true , description = "Print this help text." )
1618 private boolean help ;
1719 @ Parameter (names = {"-c" , "--create \" base\" " }, order = 0 ,
1820 description = "The type of RIM to create. A base RIM will be created by default." )
1921 private String createType = "" ;
20- @ Parameter (names = {"-v" , "--verify <path>" }, order = 3 ,
22+ @ Parameter (names = {"-v" , "--verify <path>" }, validateWith = FileArgumentValidator . class ,
2123 description = "Specify a RIM file to verify." )
2224 private String verifyFile = "" ;
2325 @ Parameter (names = {"-V" , "--version" }, description = "Output the current version." )
2426 private boolean version = false ;
25- @ Parameter (names = {"-a" , "--attributes <path>" }, order = 1 ,
27+ @ Parameter (names = {"-a" , "--attributes <path>" }, validateWith = FileArgumentValidator . class ,
2628 description = "The configuration file holding attributes "
27- + "to populate the base RIM with." )
29+ + "to populate the base RIM with. An example file can be found in /opt/rimtool/data. " )
2830 private String attributesFile = "" ;
2931 @ Parameter (names = {"-o" , "--out <path>" }, order = 2 ,
3032 description = "The file to write the RIM out to. "
3133 + "The RIM will be written to stdout by default." )
3234 private String outFile = "" ;
33- @ Parameter (names = {"-t" , "--truststore <path>" }, order = 4 ,
35+ @ Parameter (names = {"--verbose" }, description = "Control output verbosity." )
36+ private boolean verbose = false ;
37+ @ Parameter (names = {"-t" , "--truststore <path>" }, validateWith = FileArgumentValidator .class ,
3438 description = "The truststore to sign the base RIM created "
3539 + "or to validate the signed base RIM." )
3640 private String truststoreFile = "" ;
37- @ Parameter (names = {"-k" , "--privateKeyFile <path>" }, order = 5 ,
41+ @ Parameter (names = {"-k" , "--privateKeyFile <path>" },
42+ validateWith = FileArgumentValidator .class ,
3843 description = "The private key used to sign the base RIM created by this tool." )
3944 private String privateKeyFile = "" ;
40- @ Parameter (names = {"-p" , "--publicCertificate <path>" }, order = 6 ,
45+ @ Parameter (names = {"-p" , "--publicCertificate <path>" },
46+ validateWith = FileArgumentValidator .class ,
4147 description = "The public key certificate to embed in the base RIM created by "
4248 + "this tool." )
4349 private String publicCertificate = "" ;
4450 @ Parameter (names = {"-e" , "--embed-cert" }, order = 7 ,
4551 description = "Embed the provided certificate in the signed swidtag." )
4652 private boolean embedded = false ;
4753 @ Parameter (names = {"-d" , "--default-key" }, order = 8 ,
48- description = "Use default signing credentials ." )
54+ description = "Use the JKS keystore installed in /opt/rimtool/data ." )
4955 private boolean defaultKey = false ;
50- @ Parameter (names = {"-l" , "--rimel <path>" }, order = 9 ,
56+ @ Parameter (names = {"-l" , "--rimel <path>" }, validateWith = FileArgumentValidator . class ,
5157 description = "The TCG eventlog file to use as a support RIM." )
5258 private String rimEventLog = "" ;
5359 @ Parameter (names = {"--timestamp" }, order = 10 , variableArity = true ,
@@ -56,6 +62,10 @@ public class Commander {
5662 "\t RFC3339 [yyyy-MM-ddThh:mm:ssZ]\n \t RFC3852 <counterSignature.bin>" )
5763 private List <String > timestampArguments = new ArrayList <String >(2 );
5864
65+ public List <String > getUnknownOptions () {
66+ return unknownOptions ;
67+ }
68+
5969 public boolean isHelp () {
6070 return help ;
6171 }
@@ -71,6 +81,7 @@ public String getVerifyFile() {
7181 public boolean isVersion () {
7282 return version ;
7383 }
84+ public boolean isVerbose () { return verbose ; }
7485 public String getAttributesFile () {
7586 return attributesFile ;
7687 }
@@ -101,26 +112,17 @@ public List<String> getTimestampArguments() {
101112
102113 public String printHelpExamples () {
103114 StringBuilder sb = new StringBuilder ();
104- sb .append ("Create a base RIM using the values in attributes.json; " +
105- "sign it with the default keystore; " );
106- sb .append ("and write the data to base_rim.swidtag:\n \n " );
107- sb .append ("\t \t -c base -a attributes.json -d -l support_rim.bin -o base_rim.swidtag" +
108- "\n \n \n " );
109- sb .append ("Create a base RIM using the default attribute values; " );
110- sb .append ("sign it using privateKey.pem; embed cert.pem in the signature block; " );
111- sb .append ("and write the data to console output:\n \n " );
112- sb .append ("\t \t -c base -l support_rim.bin -k privateKey.pem -p cert.pem -e\n \n \n " );
113- sb .append ("Create a base RIM using the values in attributes.json; " +
114- "sign it with the default keystore; add a RFC3852 timestamp; " );
115- sb .append ("and write the data to base_rim.swidtag:\n \n " );
116- sb .append ("\t \t -c base -a attributes.json -d -l support_rim.bin " +
117- "--timestamp RFC3852 counterSignature.bin -o base_rim.swidtag\n \n \n " );
118- sb .append ("Validate a base RIM using an external support RIM to override the " );
119- sb .append ("payload file:\n \n " );
120- sb .append ("\t \t -v base_rim.swidtag -l support_rim.bin\n \n \n " );
121- sb .append ("Validate a base RIM with its own payload file and a PEM truststore " );
122- sb .append ("containing the signing cert:\n \n " );
123- sb .append ("\t \t -v base_rim.swidtag -t ca.crt\n \n \n " );
115+ sb .append ("Create a base RIM: use the values in attributes.json; " );
116+ sb .append ("add support_rim.bin to the payload; " );
117+ sb .append ("sign it using privateKey.pem and cert.pem; embed cert.pem in the signature; " );
118+ sb .append ("add a RFC3852 timestamp; and write the data to base_rim.swidtag:\n \n " );
119+ sb .append ("\t \t -c base -a attributes.json -l support_rim.bin "
120+ + "-k privateKey.pem -p cert.pem -e --timestamp RFC3852 counterSignature.bin "
121+ + "-o base_rim.swidtag\n \n \n " );
122+ sb .append ("Validate base_rim.swidtag: "
123+ + "the payload <File> is validated with support_rim.bin; "
124+ + "and the signature is validated with ca.crt:\n \n " );
125+ sb .append ("\t \t -v base_rim.swidtag -l support_rim.bin -t ca.crt\n \n \n " );
124126
125127 return sb .toString ();
126128 }
0 commit comments