Changeset 12347 for lang/perl/Punc/trunk

Timestamp:

05/25/08 21:05:44 (6 months ago)

Author:

mizzy

Message:

Moooooooooooose

Location:

lang/perl/Punc/trunk

Files:

• bin/puncd (modified) (1 diff)
• bin/puncmaster-ca (modified) (1 diff)
• bin/puncmasterd (modified) (1 diff)
• lib/Punc/Daemon.pm (modified) (1 diff)
• lib/Punc/Master/CA.pm (modified) (1 diff)
• lib/Punc/Master/Daemon.pm (modified) (2 diffs)
• lib/Punc/Slave/Daemon.pm (modified) (1 diff)

lang/perl/Punc/trunk/bin/puncd

@@ -33 +33 @@
     conf    => $conf,
     context => Punc->new->context,
-})->init;
+});
 
-$daemon->prepare->run;
+$daemon->run;

lang/perl/Punc/trunk/bin/puncmaster-ca

@@ -21 +21 @@
 my $ssldir  = File::Spec->catdir($confdir, 'ssl');
 my $ca = Punc::Master::CA->new({ ssldir  => $ssldir });
-$ca->init;
 
 for ( qw/ sign list / ) {

lang/perl/Punc/trunk/bin/puncmasterd

@@ -30 +30 @@
     context => Punc->new->context,
     conf    => $conf,
-})->init;
+});
 
-$daemon->prepare->run;
+$daemon->run;
 
 

lang/perl/Punc/trunk/lib/Punc/Daemon.pm

@@ -15 +15 @@
 has 'ssl_cert' => ( is => 'rw', isa => 'Str' );
 has 'ca_cert'  => ( is => 'rw', isa => 'Str' );
-has 'daemon' => ( is => 'rw', isa => 'HTTP::Daemon::SSL' );
 
-sub prepare {
+sub run {
     my $self = shift;
 
     my $ssl_verify_mode = ref $self eq 'Punc::Master::Daemon' ? 0x00 : 0x07;
 
-    $self->daemon(
-        HTTP::Daemon::SSL->new(
-            LocalPort       => $self->port,
-            ReuseAddr       => 1,
-            SSL_key_file    => $self->ssl_key,
-            SSL_cert_file   => $self->ssl_cert,
-            SSL_ca_file     => $self->ca_cert || '',
-            SSL_verify_mode => $ssl_verify_mode,
-        )
+    my $d = HTTP::Daemon::SSL->new(
+        LocalPort       => $self->port,
+        ReuseAddr       => 1,
+        SSL_key_file    => $self->ssl_key,
+        SSL_cert_file   => $self->ssl_cert,
+        SSL_ca_file     => $self->ca_cert || '',
+        SSL_verify_mode => $ssl_verify_mode,
     );
-
-    die $! unless $self->daemon;
-
-    return $self;
-}
-
-sub run {
-    my $self = shift;
-    my $d = $self->daemon;
 
     print "Please contact me at: <URL:", $d->url, ">\n";

lang/perl/Punc/trunk/lib/Punc/Master/CA.pm

@@ -6 +6 @@
 
 has 'ssldir'  => ( is => 'rw', isa => 'Str' );
-has 'csrdir'  => ( is => 'rw', isa => 'Str' );
-has 'certdir' => ( is => 'rw', isa => 'Str' );
-has 'cadir'   => ( is => 'rw', isa => 'Str' );
-
-sub init {
-    my $self = shift;
-    $self->csrdir( File::Spec->catdir($self->ssldir, 'csrs') );
-    $self->certdir( File::Spec->catdir($self->ssldir, 'certs') );
-    $self->cadir( File::Spec->catdir($self->ssldir, 'ca') );
-}
+has 'csrdir'  => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->ssldir, 'csrs') },
+    lazy    => 1,
+);
+has 'certdir' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->ssldir, 'certs') },
+    lazy    => 1,
+);
+has 'cadir'   => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->ssldir, 'ca') },
+    lazy    => 1,
+);
 
 sub get_hostname_from_csr {

lang/perl/Punc/trunk/lib/Punc/Master/Daemon.pm

@@ -18 +18 @@
 );
 
-sub init {
+has 'ssl_key' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catfile(shift->ca->cadir, 'ca.key') },
+    lazy    => 1,
+);
+
+has 'ssl_cert' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catfile(shift->ca->cadir, 'ca.cert') },
+    lazy    => 1,
+);
+
+before 'run' => sub {
     my $self = shift;
 
@@ -26 +40 @@
         })
       );
-    $self->ca->init;
 
     $self->_find_or_create_ca_cert($self->context);
-
-    $self->ssl_key( File::Spec->catfile($self->ca->cadir, 'ca.key') );
-    $self->ssl_cert( File::Spec->catfile($self->ca->cadir, 'ca.cert') );
-    return $self;
-}
+};
 
 sub _find_or_create_ca_cert {

lang/perl/Punc/trunk/lib/Punc/Slave/Daemon.pm

@@ -11 +11 @@
 with 'Punc::Daemon::Role';
 
-has 'keydir'  => ( is => 'rw', isa => 'Str' );
-has 'certdir' => ( is => 'rw', isa => 'Str' );
-has 'ssldir'  => ( is => 'rw', isa => 'Str' );
-has 'csrdir'  => ( is => 'rw', isa => 'Str' );
+has 'ssldir' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->confdir, 'ssl') },
+    lazy    => 1,
+);
 
-sub init {
+has 'keydir'  => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->ssldir, 'keys') },
+    lazy    => 1,
+);
+
+has 'csrdir'  => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->ssldir, 'csrs') },
+    lazy    => 1,
+);
+
+has 'certdir' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catdir(shift->ssldir, 'certs') },
+    lazy    => 1,
+);
+
+has 'fqdn'    => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { Punc->context->fact('fqdn') },
+);
+
+has 'ssl_key' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub {
+        my $self = shift;
+        File::Spec->catfile($self->keydir, $self->fqdn . '.key');
+    },
+    lazy    => 1,
+);
+
+has 'ssl_cert' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub {
+        my $self = shift;
+        File::Spec->catfile($self->certdir, $self->fqdn . '.cert');
+    },
+    lazy    => 1,
+);
+
+has 'ca_cert' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catfile(shift->certdir, 'ca.cert'); },
+    lazy    => 1,
+);
+
+before 'run' => sub {
     my $self = shift;
-
     $self->_find_or_request_cert($self->context);
-
-    my $fqdn = $self->context->fact('fqdn');
-
-    $self->ssl_key( File::Spec->catfile($self->keydir, "${fqdn}.key") );
-    $self->ssl_cert( File::Spec->catfile($self->certdir, "${fqdn}.cert") );
-    $self->ca_cert( File::Spec->catfile($self->certdir, 'ca.cert') );
-
-    return $self;
-}
+};
 
 sub _find_or_request_cert {
     my ( $self, $c ) = @_;
-
-    $self->ssldir( File::Spec->catdir($self->confdir, 'ssl') );
-    $self->certdir( File::Spec->catdir($self->ssldir, 'certs') );
-    $self->keydir( File::Spec->catdir($self->ssldir, 'keys') );
-    $self->csrdir( File::Spec->catdir($self->ssldir, 'csrs') );
 
     mkpath($self->certdir) unless -d $self->certdir;