Changeset 11237

Timestamp:

08/19/08 14:54:47 (5 months ago)

Author:

/C=ES/O=Warp Networks S.L./CN=ejhernandez@…

Message:

SOAP location configuration is done refs #1103

Location:

branches/remote-services/ebox

Files:

• debian/dirs (modified) (1 diff)
• src/EBox/RemoteServices.pm (modified) (6 diffs)
• src/EBox/RemoteServices/Auth.pm (modified) (1 diff)
• src/EBox/RemoteServices/Makefile.am (modified) (1 diff)
• src/EBox/RemoteServices/Model/Subscription.pm (modified) (1 diff)
• src/EBox/RemoteServices/Server/JobReceiver.pm (modified) (1 diff)
• src/EBox/RemoteServices/Server/t/jobReceiver.t (modified) (1 diff)
• src/EBox/RemoteServices/Subscription.pm (modified) (1 diff)
• src/EBox/RemoteServices/WSDispatcher.pm (modified) (1 diff)
• src/libexec/ebox-runnerd (modified) (1 diff)

branches/remote-services/ebox/debian/dirs

@@ -1 +1 @@
 var/lib/ebox/
 var/lib/ebox/conf
+var/lib/ebox/conf/remoteservices
 var/lib/ebox/tmp
 var/lib/ebox/log

branches/remote-services/ebox/src/EBox/RemoteServices.pm

@@ -28 +28 @@
 use warnings;
 
+use Error qw(:try);
+
 # eBox uses
+use EBox::Config;
+use EBox::Exceptions::Internal;
 use EBox::Gettext;
+use EBox::Global;
+use EBox::Sudo;
+
+# Constants
+use constant SERV_DIR      => EBox::Config::conf() . 'remoteservices/';
+use constant CA_DIR        => SERV_DIR . 'ssl-ca/';
+use constant SUBS_DIR      => SERV_DIR . 'subscription/';
+use constant WS_DISPATCHER => __PACKAGE__ . '::WSDispatcher';
 
 # Group: Protected methods
@@ -75 +87 @@
 # Method: _regenConfig
 #
-#        Regenerate the configuration for the events
+#        Regenerate the configuration for the remote services module
 #
 # Overrides:
@@ -81 +93 @@
 #       <EBox::Module::_regenConfig>
 #
-# Exceptions:
-#
-#       <EBox::Exceptions::External> - if no event watcher and event
-#       dispatcher are enabled
-#
 sub _regenConfig
 {
@@ -91 +98 @@
       my ($self) = @_;
 
+      $self->_confSOAPService();
+
       return;
 }
@@ -103 +112 @@
 sub _stopService
 {
-
 
 }
@@ -204 +212 @@
 }
 
+# Group: Private methods
+
+# Configure the SOAP server
+#
+# if subscribed
+# 1. Write soap-loc.mas template
+# 2. Write the SSLCACertificatePath directory
+# 3. Add include in ebox-apache configuration
+# else
+# 1. Remove SSLCACertificatePath directory
+# 2. Remove include in ebox-apache configuration
+#
+sub _confSOAPService
+{
+    my ($self) = @_;
+
+    my $confFile = SERV_DIR . 'soap-loc.conf';
+    my $apacheMod = EBox::Global->modInstance('apache');
+    if ($self->eBoxSubscribed()) {
+        my @tmplParams = (
+            (soapHandler   => WS_DISPATCHER),
+            (domainName    => $self->_confKeys()->{domain}),
+            (allowedPrefix => $self->_allowedPrefix()),
+            (caPath        => CA_DIR));
+        $self->writeConfFile( $confFile, 'remoteservices/soap-loc.mas',
+                              \@tmplParams);
+        unless ( -d CA_DIR ) {
+            mkdir(CA_DIR);
+        }
+        my $caLinkPath = $self->_caLinkPath();
+        unless ( -l $caLinkPath ) {
+            symlink($self->_caCertPath(), $caLinkPath );
+        }
+        $apacheMod->addInclude($confFile);
+    } else {
+        unlink($confFile);
+        # Remove CA_DIR
+        opendir(my $dir, CA_DIR);
+        while(my $file = readdir($dir)) {
+            # Check if it is a symbolic link file to remove it
+            next unless (-l CA_DIR . $file);
+            unlink(CA_DIR . $file);
+        }
+        closedir($dir);
+        try {
+            $apacheMod->removeInclude($confFile);
+        } catch EBox::Exceptions::Internal with {
+            # Do nothing if it's already remove
+            ;
+        };
+    }
+    $apacheMod->save();
+
+}
+
+# Return the allowed prefix to send jobs
+sub _allowedPrefix
+{
+    my ($self) = @_;
+
+    my $mmProxy = $self->_confKeys()->{managementProxy};
+    # Return only the prefix
+    my ($prefix) = $mmProxy =~ m:^(.*?)[0-9]*\.:;
+    return $prefix;
+}
+
+# Return the given configuration file from the control center
+sub _confKeys
+{
+    my ($self) = @_;
+
+    unless ( defined($self->{confFile}) ) {
+        my $confDir = SUBS_DIR . $self->eBoxCommonName();
+        $self->{confFile} = (<$confDir/*.conf>)[0];
+    }
+    unless ( defined($self->{confKeys}) ) {
+        $self->{confKeys} = EBox::Config::configKeysFromFile($self->{confFile});
+    }
+    return $self->{confKeys};
+}
+
+# Return the CA cert path
+sub _caCertPath
+{
+    my ($self) = @_;
+
+    return SUBS_DIR . $self->eBoxCommonName() . '/cacert.pem';
+
+}
+
+# Return the link name for the CA certificate in the given format
+# hashValue.0 - hash value is the output from openssl ciphering
+sub _caLinkPath
+{
+    my ($self) = @_;
+
+    my $caCertPath = $self->_caCertPath();
+    my $hashRet = EBox::Sudo::command("openssl x509 -hash -noout -in $caCertPath");
+
+    my $hashValue = $hashRet->[0];
+    chomp($hashValue);
+    return CA_DIR . "${hashValue}.0";
+
+}
+
 1;

branches/remote-services/ebox/src/EBox/RemoteServices/Auth.pm

@@ -36 +36 @@
 
 # Constants
-use constant SERV_SUBDIR => 'remote-services';
+use constant SERV_SUBDIR => 'remoteservices/subscription';
 
 # Group: Public methods

branches/remote-services/ebox/src/EBox/RemoteServices/Makefile.am

@@ -4 +4 @@
 
 mods = Alerts.pm Auth.pm Base.pm Backup.pm ProxyBackup.pm SOAPClient.pm \
-        Subscription.pm
+        Subscription.pm WSDispatcher.pm
 
 nobase_perl_DATA = $(mods)

branches/remote-services/ebox/src/EBox/RemoteServices/Model/Subscription.pm

@@ -152 +152 @@
     $self->SUPER::setTypedRow($id, $paramsRef, %optParams);
 
+    # Mark RemoteServices module as changed
+    $self->{gconfmodule}->setAsChanged();
+
     $self->{gconfmodule}->st_set_bool('subscribed', not $subs);
 

branches/remote-services/ebox/src/EBox/RemoteServices/Server/JobReceiver.pm

@@ -36 +36 @@
 use File::Slurp;
 
-use constant JOBS_DIR     => EBox::Config::conf() . 'remote-services/jobs/';
+use constant JOBS_DIR     => EBox::Config::conf() . 'remoteservices/jobs/';
 use constant INCOMING_DIR => JOBS_DIR . 'incoming/';
 

branches/remote-services/ebox/src/EBox/RemoteServices/Server/t/jobReceiver.t

@@ -47 +47 @@
                   script => qq{#!/bin/bash\necho "\$@"},
                   arguments => $args);
-my $jobDirPath = EBox::Config::conf() . "remote-services/jobs/$jobId/";
+my $jobDirPath = EBox::Config::conf() . "remoteservices/jobs/$jobId/";
 my $cmd = new Test::Cmd(
     prog => "${jobDirPath}script",

branches/remote-services/ebox/src/EBox/RemoteServices/Subscription.pm

@@ -40 +40 @@
 # Constants
 use constant {
-    SERV_SUBDIR => 'remote-services',
+    SERV_SUBDIR => 'remoteservices/subscription',
     SERV_CONF_FILE => '78remoteservices.conf',
 };

branches/remote-services/ebox/src/EBox/RemoteServices/WSDispatcher.pm

@@ -30 +30 @@
 
 my $server = SOAP::Transport::HTTP::Apache
-  -> dispatch_to('EBox::RemoteServices::Server::JobReceiver::runJob');
+  ->dispatch_with(
+      { 'urn:EBox/Services/Jobs' => 'EBox::RemoteServices::Server::JobReceiver' }
+     );
 
 # Method: handler

branches/remote-services/ebox/src/libexec/ebox-runnerd

@@ -7 +7 @@
 use POSIX qw(SIG_IGN SIGHUP);
 
-use constant JOBS_DIR      => EBox::Config::conf() . 'remote-services/jobs/';
+use constant JOBS_DIR      => EBox::Config::conf() . 'remoteservices/jobs/';
 use constant INCOMING_DIR  => JOBS_DIR . 'incoming/';
 use constant OUTCOMING_DIR => JOBS_DIR . 'outcoming/';