Changeset 10463 for lang/perl/Punc

Timestamp:

04/25/08 23:49:01 (7 months ago)

Author:

mizzy

Message:

SSLクライアント認証に対応した。これで同一のCAから発行された証明書を提示したリクエストのみ、puncdは処理をする。

Location:

lang/perl/Punc/trunk

Files:

• Makefile.PL (modified) (1 diff)
• bin/punc (modified) (1 diff)
• lib/Punc/Client.pm (modified) (2 diffs)
• lib/Punc/Client/Request.pm (modified) (3 diffs)
• lib/Punc/Daemon.pm (modified) (1 diff)
• lib/Punc/Slave/Daemon.pm (modified) (2 diffs)
• lib/Punc/Slave/Module/Service/RedHat.pm (modified) (1 diff)

lang/perl/Punc/trunk/Makefile.PL

@@ -18 +18 @@
                        Pod::Usage
                        File::Path
+                       Crypt::SSLeay
                    /);
 

lang/perl/Punc/trunk/bin/punc

@@ -16 +16 @@
 
 for (@$res) {
-    if ( $method eq 'description' ) {
+    if ( $method eq 'description' || $method eq 'desc' ) {
         print $_->{response}->{result};
     }

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

@@ -7 +7 @@
 use Punc::Client::Request;
 use UNIVERSAL::require;
+use FindBin;
 
 sub new {
     my ( $class, $target ) = @_;
 
+    ### TODO: confdir のデフォルト値を変更
     ## TODO: $target から対象ホストをリストアップ
 
-    bless { hosts => [ $target ] }, $class;
+    bless {
+        hosts   => [ $target ],
+        confdir => "$FindBin::Bin/../etc",
+    }, $class;
 }
 
@@ -23 +28 @@
 
     return Punc::Client::Request->new({
-        hosts  => $self->{hosts},
-        module => $module,
+        confdir => $self->{confdir},
+        hosts   => $self->{hosts},
+        module  => $module,
     });
 }

lang/perl/Punc/trunk/lib/Punc/Client/Request.pm

@@ -6 +6 @@
 use JSON::RPC::Client;
 use Punc::Client::Response;
+use File::Spec;
+
 our $AUTOLOAD;
 
 sub new {
     my ( $class, $args ) = @_;
+
+    $ENV{HTTPS_VERSION}   = 3;
+    $ENV{HTTPS_CERT_FILE} = File::Spec->catfile(
+        $args->{confdir}, 'ssl', 'ca', 'ca.cert'
+    );
+    $ENV{HTTPS_KEY_FILE}  = File::Spec->catfile(
+        $args->{confdir}, 'ssl', 'ca', 'ca.key'
+    );
+
+    $args->{client} = JSON::RPC::Client->new;
+
     bless $args, $class;
 }
@@ -18 +31 @@
     my $response = Punc::Client::Response->new;
     for my $host ( @{ $self->{hosts} } ) {
-        my $client = new JSON::RPC::Client;
+
         my $url    = "https://$host:7080/$self->{module}";
         my $callobj = {
@@ -25 +38 @@
         };
 
-        my $res = $client->call($url, $callobj);
+        my $res = $self->{client}->call($url, $callobj);
 
         if( $res ) {

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

@@ -21 +21 @@
 sub run {
     my $self = shift;
+
+    my $ssl_verify_mode = ref $self eq 'Punc::Master::Daemon' ? 0x00 : 0x07;
+
     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} || '',
+        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 $!;
 

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

@@ -22 +22 @@
     $self->{ssl_cert} = File::Spec->catfile($self->{certdir}, "${fqdn}.cert");
     $self->{ca_cert}  = File::Spec->catfile($self->{certdir}, 'ca.cert');
-
     return $self;
 }
@@ -97 +96 @@
 
     my $res;
-    if ( $method eq 'description' ) {
+    if ( $method eq 'description' || $method eq 'desc' ) {
         $res = $module->description;
     }

lang/perl/Punc/trunk/lib/Punc/Slave/Module/Service/RedHat.pm

@@ -5 +5 @@
 use base qw( Punc::Slave::Module::Service );
 
+### TODO: もっと簡単に定義できないか考える
+### default_for { operatingsystem => [ qw/ redhat fedora centos / ] } とか
+### use Punc::Slave::Module::Service { operatingsystem => [ qw / fedora / ] } とか
 sub default_for {
     return { 'operatingsystem' => [ 'redhat', 'fedora', 'centos' ] }