/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl.xml

  • Committer: Teddy Hogeborn
  • Date: 2019-02-28 21:45:13 UTC
  • Revision ID: teddy@recompile.se-20190228214513-58glsld2x80fq684
mandos-ctl: Refactor and add more tests

* mandos-ctl (string_to_delta): Factor out old-style parsing to its
                                own function.  Log a warning if
                                old-style parsing is invoked.
  (parse_pre_1_6_1_interval): New; factored out of string_to_delta.
                              Also added more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos-ctl">
5
 
<!ENTITY TIMESTAMP "2019-07-29">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
62
62
  <refsynopsisdiv>
63
63
    <cmdsynopsis>
64
64
      <command>&COMMANDNAME;</command>
65
 
      <group>
66
 
          <arg choice="plain"><option>--verbose</option></arg>
67
 
          <arg choice="plain"><option>-v</option></arg>
68
 
          <sbr/>
69
 
          <arg choice="plain"><option>--dump-json</option></arg>
70
 
          <arg choice="plain"><option>-j</option></arg>
71
 
      </group>
72
 
      <arg><option>--debug</option></arg>
73
 
      <group>
74
 
        <arg rep='repeat' choice='plain'>
75
 
          <replaceable>CLIENT</replaceable>
76
 
        </arg>
77
 
      </group>
78
 
    </cmdsynopsis>
79
 
    <cmdsynopsis>
80
 
      <command>&COMMANDNAME;</command>
81
65
      <group choice="req">
82
66
        <group>
83
67
          <arg choice="plain"><option>--enable</option></arg>
94
78
        <sbr/>
95
79
        <group>
96
80
          <arg choice="plain"><option>--start-checker</option></arg>
 
81
        </group>
 
82
        <sbr/>
 
83
        <group>
97
84
          <arg choice="plain"><option>--stop-checker</option></arg>
98
85
        </group>
99
86
        <sbr/>
100
87
        <group>
 
88
          <arg choice="plain"><option>--remove</option></arg>
 
89
          <arg choice="plain"><option>-r</option></arg>
 
90
        </group>
 
91
        <sbr/>
 
92
        <group>
101
93
          <arg choice="plain"><option>--checker
102
94
          <replaceable>COMMAND</replaceable></option></arg>
103
95
          <arg choice="plain"><option>-c
141
133
        </group>
142
134
        <sbr/>
143
135
        <group>
 
136
          <arg choice="plain"><option>--interval
 
137
          <replaceable>TIME</replaceable></option></arg>
 
138
          <arg choice="plain"><option>-i
 
139
          <replaceable>TIME</replaceable></option></arg>
 
140
        </group>
 
141
        <sbr/>
 
142
        <group>
144
143
          <arg choice="plain"><option>--host
145
144
          <replaceable>STRING</replaceable></option></arg>
146
145
          <arg choice="plain"><option>-H
163
162
        </group>
164
163
      </group>
165
164
      <sbr/>
166
 
      <arg><option>--debug</option></arg>
167
165
      <group choice="req">
168
166
        <arg choice="plain"><option>--all</option></arg>
169
167
        <arg choice="plain"><option>-a</option></arg>
175
173
    <cmdsynopsis>
176
174
      <command>&COMMANDNAME;</command>
177
175
      <group>
178
 
        <arg choice="plain"><option>--deny</option></arg>
179
 
        <arg choice="plain"><option>-D</option></arg>
180
 
      </group>
181
 
      <group choice="req">
182
 
          <arg choice="plain"><option>--remove</option></arg>
183
 
          <arg choice="plain"><option>-r</option></arg>
184
 
      </group>
185
 
      <sbr/>
186
 
      <arg><option>--debug</option></arg>
187
 
      <group choice="req">
188
 
        <arg choice="plain"><option>--all</option></arg>
189
 
        <arg choice="plain"><option>-a</option></arg>
 
176
          <arg choice="plain"><option>--verbose</option></arg>
 
177
          <arg choice="plain"><option>-v</option></arg>
 
178
          <sbr/>
 
179
          <arg choice="plain"><option>--dump-json</option></arg>
 
180
          <arg choice="plain"><option>-j</option></arg>
 
181
      </group>
 
182
      <group>
190
183
        <arg rep='repeat' choice='plain'>
191
184
          <replaceable>CLIENT</replaceable>
192
185
        </arg>
198
191
        <arg choice="plain"><option>--is-enabled</option></arg>
199
192
        <arg choice="plain"><option>-V</option></arg>
200
193
      </group>
201
 
      <arg><option>--debug</option></arg>
202
194
      <arg choice='plain'><replaceable>CLIENT</replaceable></arg>
203
195
    </cmdsynopsis>
204
196
    <cmdsynopsis>
512
504
      </varlistentry>
513
505
      
514
506
      <varlistentry>
515
 
        <term><option>--debug</option></term>
516
 
        <listitem>
517
 
          <para>
518
 
            Show debug output; currently, this means show D-Bus calls.
519
 
          </para>
520
 
        </listitem>
521
 
      </varlistentry>
522
 
      
523
 
      <varlistentry>
524
507
        <term><option>--check</option></term>
525
508
        <listitem>
526
509
          <para>
557
540
  
558
541
  <refsect1 id="example">
559
542
    <title>EXAMPLE</title>
560
 
    <!-- Name of test methods in class Test_commands_from_options are
561
 
         written in comments below.  When adding an example, add a
562
 
         test too which tests the documented behavior. -->
563
543
    <informalexample>
564
 
      <!-- Test method: test_manual_page_example_1() -->
565
544
      <para>
566
545
        To list all clients:
567
546
      </para>
571
550
    </informalexample>
572
551
    
573
552
    <informalexample>
574
 
      <!-- Test method: test_manual_page_example_2() -->
575
553
      <para>
576
554
        To list <emphasis>all</emphasis> settings for the clients
577
555
        named <quote>foo1.example.org</quote> and <quote
586
564
    </informalexample>
587
565
    
588
566
    <informalexample>
589
 
      <!-- Test method: test_manual_page_example_3() -->
590
567
      <para>
591
568
        To enable all clients:
592
569
      </para>
596
573
    </informalexample>
597
574
    
598
575
    <informalexample>
599
 
      <!-- Test method: test_manual_page_example_4() -->
600
576
      <para>
601
577
        To change timeout and interval value for the clients
602
578
        named <quote>foo1.example.org</quote> and <quote
605
581
      <para>
606
582
 
607
583
<!-- do not wrap this line -->
608
 
<userinput>&COMMANDNAME; --timeout=PT5M --interval=PT1M foo1.example.org foo2.example.org</userinput>
 
584
<userinput>&COMMANDNAME; --timeout="5m" --interval="1m" foo1.example.org foo2.example.org</userinput>
609
585
 
610
586
      </para>
611
587
    </informalexample>
612
588
    
613
589
    <informalexample>
614
 
      <!-- Test method: test_manual_page_example_5() -->
615
590
      <para>
616
 
        To approve all clients currently waiting for approval:
 
591
        To approve all clients currently waiting for it:
617
592
      </para>
618
593
      <para>
619
594
        <userinput>&COMMANDNAME; --approve --all</userinput>