/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.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 10:59:18 UTC
  • Revision ID: teddy@recompile.se-20160228105918-tb8pt2p5j0tkcls3
Handle GnuTLS errors and partial sends in gnutls "module".

* mandos (GnuTLS.E_INTERRUPTED, GnuTLS.E_AGAIN): New.
  (GnuTLS.Error): Set error code as "code" attribute.
  (GnuTLS.ClientSession.send): Handle partial sends with a loop.
  (GnuTLS._retry_on_error): New function.
  (GnuTLS.record_send, GnuTLS.handshake, GnuTLS.bye): Set "errcheck"
                                                      attribute to
                                                    "_retry_on_error".
  (ClientHandler.handle): Remove loop for handling partial sends;
                          GnuTLS.ClientSession.send() will do that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.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">
5
 
<!ENTITY TIMESTAMP "2012-01-01">
 
5
<!ENTITY TIMESTAMP "2015-12-06">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
39
42
      <holder>Teddy Hogeborn</holder>
40
43
      <holder>Björn Påhlsson</holder>
41
44
    </copyright>
100
103
      <sbr/>
101
104
      <arg><option>--statedir
102
105
      <replaceable>DIRECTORY</replaceable></option></arg>
 
106
      <sbr/>
 
107
      <arg><option>--socket
 
108
      <replaceable>FD</replaceable></option></arg>
 
109
      <sbr/>
 
110
      <arg><option>--foreground</option></arg>
 
111
      <sbr/>
 
112
      <arg><option>--no-zeroconf</option></arg>
103
113
    </cmdsynopsis>
104
114
    <cmdsynopsis>
105
115
      <command>&COMMANDNAME;</command>
299
309
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
300
310
        </listitem>
301
311
      </varlistentry>
 
312
      
 
313
      <varlistentry>
 
314
        <term><option>--socket
 
315
        <replaceable>FD</replaceable></option></term>
 
316
        <listitem>
 
317
          <xi:include href="mandos-options.xml" xpointer="socket"/>
 
318
        </listitem>
 
319
      </varlistentry>
 
320
      
 
321
      <varlistentry>
 
322
        <term><option>--foreground</option></term>
 
323
        <listitem>
 
324
          <xi:include href="mandos-options.xml"
 
325
                      xpointer="foreground"/>
 
326
        </listitem>
 
327
      </varlistentry>
 
328
      
 
329
      <varlistentry>
 
330
        <term><option>--no-zeroconf</option></term>
 
331
        <listitem>
 
332
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
333
        </listitem>
 
334
      </varlistentry>
 
335
      
302
336
    </variablelist>
303
337
  </refsect1>
304
338
  
381
415
      extended timeout, checker program, and interval between checks
382
416
      can be configured both globally and per client; see
383
417
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
384
 
      <manvolnum>5</manvolnum></citerefentry>.  A client successfully
385
 
      receiving its password will also be treated as a successful
386
 
      checker run.
 
418
      <manvolnum>5</manvolnum></citerefentry>.
387
419
    </para>
388
420
  </refsect1>
389
421
  
496
528
        </listitem>
497
529
      </varlistentry>
498
530
      <varlistentry>
499
 
        <term><filename>/var/run/mandos.pid</filename></term>
 
531
        <term><filename>/run/mandos.pid</filename></term>
500
532
        <listitem>
501
533
          <para>
502
534
            The file containing the process id of the
503
535
            <command>&COMMANDNAME;</command> process started last.
 
536
            <emphasis >Note:</emphasis> If the <filename
 
537
            class="directory">/run</filename> directory does not
 
538
            exist, <filename>/var/run/mandos.pid</filename> will be
 
539
            used instead.
504
540
          </para>
505
541
        </listitem>
506
542
      </varlistentry>
507
543
      <varlistentry>
508
 
        <term><filename class="devicefile">/dev/log</filename></term>
509
 
      </varlistentry>
510
 
      <varlistentry>
511
544
        <term><filename
512
545
        class="directory">/var/lib/mandos</filename></term>
513
546
        <listitem>
519
552
        </listitem>
520
553
      </varlistentry>
521
554
      <varlistentry>
522
 
        <term><filename>/dev/log</filename></term>
 
555
        <term><filename class="devicefile">/dev/log</filename></term>
523
556
        <listitem>
524
557
          <para>
525
558
            The Unix domain socket to where local syslog messages are
551
584
      There is no fine-grained control over logging and debug output.
552
585
    </para>
553
586
    <para>
554
 
      Debug mode is conflated with running in the foreground.
555
 
    </para>
556
 
    <para>
557
587
      This server does not check the expire time of clients’ OpenPGP
558
588
      keys.
559
589
    </para>
675
705
      </varlistentry>
676
706
      <varlistentry>
677
707
        <term>
678
 
          <ulink url="http://www.gnu.org/software/gnutls/"
679
 
          >GnuTLS</ulink>
 
708
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
680
709
        </term>
681
710
      <listitem>
682
711
        <para>
720
749
      </varlistentry>
721
750
      <varlistentry>
722
751
        <term>
723
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
724
 
          Protocol Version 1.1</citetitle>
 
752
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
753
          Protocol Version 1.2</citetitle>
725
754
        </term>
726
755
      <listitem>
727
756
        <para>
728
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
757
          TLS 1.2 is the protocol implemented by GnuTLS.
729
758
        </para>
730
759
      </listitem>
731
760
      </varlistentry>
741
770
      </varlistentry>
742
771
      <varlistentry>
743
772
        <term>
744
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
745
 
          Security</citetitle>
 
773
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
774
          Security (TLS) Authentication</citetitle>
746
775
        </term>
747
776
      <listitem>
748
777
        <para>