Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master#http accessor #20

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Master#http accessor #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
97f2bcc
Issue with checksum while files synchronization
arbenina Jul 9, 2015
3e3137f
Initial commit
arbenina May 17, 2015
ff2d25d
PSGI App and his runner
arbenina May 28, 2015
81127ec
Changes on client side:
arbenina Jun 7, 2015
f977947
Client side changes(Part II)
arbenina Jun 12, 2015
cc74ff4
Added class for bidirectionally forward data
arbenina Jun 22, 2015
13f0f79
Different improvements
arbenina Jun 26, 2015
bd51d6b
Improvements
arbenina Jul 3, 2015
bcd43cf
Server-side improvements:
arbenina Jul 12, 2015
30175f6
Run psgi app on web-servers
arbenina Jul 21, 2015
67ca55f
Server side improvements & clean up code:
arbenina Jul 26, 2015
f737ffe
Integration with Log4perl
arbenina Aug 4, 2015
c921de9
Integration with Log4perl(part II)
arbenina Aug 10, 2015
808efde
Add Log4perl into package dependencies
arbenina Aug 12, 2015
39a2fb0
Add brief documentation for each method
arbenina Aug 15, 2015
cea8248
Delete unusable files
arbenina Aug 15, 2015
422e208
Add documentation(Part II)
arbenina Aug 16, 2015
4e279e6
Fixed for travis-ci tests
arbenina Aug 20, 2015
f0bea39
Fixed travis-ci tests(Part II)
arbenina Aug 20, 2015
292991c
Fixed travis-ci tests(Part III)
arbenina Aug 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions Build.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,52 @@ use strict;
use warnings;
use Module::Build;

my $builder = Module::Build->new(
my $class = Module::Build->subclass(code => <<'YAPP');
use Parse::Yapp;
sub process_yapp_files {
my $self = shift;

if ( $self->{invoked_action} && $self->{invoked_action} =~ m/^build$/i ) {
print "Build yapp files\n";

my $yapp_file = q{syncdiff_cfg_parser.y};
my ($pack_file, $pack_name) = ("FileSync/SyncDiff/ParseCfg.pm", "FileSync::SyncDiff::ParseCfg");
eval {
my ($yapp) = Parse::Yapp->new(inputfile => $yapp_file);
open(my $fh, '>', $pack_file);
print $fh $yapp->Output(classname => $pack_name);
close($fh);
};
if ($@) {
print "Can not build yapp files $! \n";
}
}
}
YAPP

my $builder = $class->new(
module_name => 'SyncDiff',
dist_name => 'syncdiff',
dist_version => '0.1',
license => 'lgpl_2_1',
dist_author => 'warthog9@eaglescrag.net',
dist_abstract => 'SyncDiff(erent) is a statefull rsync-like file synchronizer. Think rsync + git + csync2 + unison',
requires => {
'Module::Build' => 0.4205,
'Module::Build' => 0.4214,
'Moose' => 1.15,
'Parse::Lex' => 0,
'DBD::SQLite' => 1.27,
'Digest::SHA' => 5.47,
'Parse::Yapp' => 0,
'Parse::Yapp::Driver' => 1.05,
'File::FnMatch' => 0.02,
'Try::Tiny' => 0.11,
'File::Rdiff' => 1.0,
'JSON::XS' => 2.27,
'URI' => 1.67,
'Plack' => 1.0037,
'IO::Socket::Forwarder' => 0.02,
'Log::Log4perl' => 1.46,
},
meta_merge => {
resources => {
Expand All @@ -28,6 +56,6 @@ my $builder = Module::Build->new(
},
test => {TESTS => 't/*.t'}
);

$builder->add_build_element('yapp');
$builder->create_build_script();
print "Have a great day!\n";
134 changes: 89 additions & 45 deletions FileSync/SyncDiff/Client.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ extends qw(FileSync::SyncDiff::Forkable);
use FileSync::SyncDiff::File;
use FileSync::SyncDiff::Util;
use FileSync::SyncDiff::Protocol::v1;
use FileSync::SyncDiff::Log;

#
# Other Includes
Expand All @@ -51,6 +52,10 @@ use JSON::XS;
use MIME::Base64;
use IO::Socket;
use IO::Handle;
use IO::Socket::INET;
use LWP::UserAgent;
use URI;
use Net::Domain qw(domainname);

use Scalar::Util qw(looks_like_number);

Expand Down Expand Up @@ -111,6 +116,16 @@ has 'protocol_object' => (
isa => 'Object',
);

# Logger system
has 'log' => (
is => 'rw',
isa => 'FileSync::SyncDiff::Log',
default => sub {
my $self = shift;
return FileSync::SyncDiff::Log->new( config => $self->config );
}
);

# End variables

#
Expand Down Expand Up @@ -162,25 +177,15 @@ sub fork_and_connect {
my( $self ) = @_;
my $dbref = $self->dbref();

print "Client::fork_and_connect - ". $self->group ." - ". $self->groupbase ."\n";
print Dumper $self->config_options;
$self->log->debug("Client::fork_and_connect - %s - %s",$self->group,$self->groupbase);
$self->log->debug("Config options: %s",Dumper($self->config_options));

print "Client::fork_and_connect - path\n";
print Dumper $self->groupbase_path;
$self->log->debug("Client::fork_and_connect - path %s", Dumper($self->groupbase_path));

if( ! -e $self->groupbase_path ){
die( "Path: ". $self->groupbase_path ." does *NOT* exist in group ". $self->group ." - sadly dying now.\n" );
$self->log->fatal( "Path: %s does *NOT* exist in group %s - sadly dying now", $self->groupbase_path, $self->group );
}

#
# Going chroot
# everything else we need should
# be in the chroot, or accessible
# via pipes
#
chroot( $self->groupbase_path );
chdir("/");

#
# Ok now we need to connect to the
# various hosts associated with
Expand All @@ -206,44 +211,87 @@ sub fork_and_connect {
#

foreach my $host ( @{ $self->config_options->{groups}->{ $self->group }->{host} } ){
print "Host: ". $host ."\n";
my $ip = $self->dbref->gethostbyname( $host );
print "Ip: ". $ip ."\n";
my $sock = new IO::Socket::INET (
PeerAddr => $ip,
PeerPort => '7070',
Proto => 'tcp',
);
$self->log->debug("Host: %s", $host->{host});
my $ip = $self->dbref->gethostbyname( $host->{host} );
$self->log->debug("Ip: %s", $ip);
my $port = $host->{port} || '7070';

if ( $host->{proto} && $host->{proto} =~ /^http[s]?$/ ) {
my %agent_opt = ( timeout => 10 );
my $ua = LWP::UserAgent->new(%agent_opt);
my $uri = URI->new();

my $params = {
key => $self->config_options->{groups}->{ $self->group }->{key},
include => $self->groupbase_path,
host => inet_ntoa(inet_aton(domainname())),
};
$uri->scheme($host->{proto});
$uri->host($host->{host});
$uri->port($host->{port});

my $response = $ua->post($uri,$params);
if ( $response->is_success ) {
$self->log->info("Success response from %s", $host->{host});
}
else {
my $msg = $response->message;
$self->log->error("Failed response from %s : %s", $host->{host}, $msg);
next;
}

my $json = decode_json($response->decoded_content);
if ( $json ) {
$ip = $json->{host} ? $json->{host} : $ip;
$port = $json->{port} ? $json->{port} : $port;
}

}

#
# Going chroot
# everything else we need should
# be in the chroot, or accessible
# via pipes
#
chroot( $self->groupbase_path );
chdir("/");

my $sock = eval {
IO::Socket::INET->new(
PeerAddr => $ip,
PeerPort => $port,
Proto => 'tcp',
);
};
if( ! $sock ){
print "Could not create socket: $!\n";
$self->log->warn("Could not create socket: %s", $!);
next;
} # end skipping if the socket is broken

$sock->autoflush(1);

$self->socket( $sock );

# print $sock "Hello World!\n";
#
#
# We need to authenticate against the server
# before we try to negotiate a protocol
#

my $auth_status = $self->authenticate_to( $dbref->getlocalhostname, $self->group, $self->config_options->{groups}->{ $self->group }->{key} );

print "Auth Status: $auth_status\n";
$self->log->debug("Auth Status: %s",$auth_status);

if( $auth_status == 0 ){
print "Authentication failed for $host\n";
$self->log->info("Authentication failed for %s", $host->{host});
$sock->shutdown(2);
next;
}

#
# Ok, here we get the proper protocol all worked out
#
$self->request_protocol_versions( $host );
$self->request_protocol_versions( $host->{host} );

#
# Next we should let the protocol object take over
Expand All @@ -253,7 +301,7 @@ sub fork_and_connect {
# complex or a major issue. Pass it on and let go
#

print "Protocol should be setup\n";
$self->log->debug("Protocol should be setup");
my $protocol_obj = $self->protocol_object();

$protocol_obj->client_run();
Expand All @@ -274,8 +322,7 @@ sub authenticate_to {

my $auth_status = $self->basic_send_request( %request );

print "authenticate_to status:\n";
print Dumper $auth_status;
$self->log->debug("authenticate_to status: %s",Dumper ($auth_status));

if( $auth_status == 0 ){
return 1;
Expand All @@ -291,21 +338,20 @@ sub request_protocol_versions {
'operation' => 'request_protocol_versions',
);

print "Going to request Protocol Versions:\n";
$self->log->debug("Going to request Protocol Versions:");

my $versions = $self->basic_send_request( %request );

print "Got Back Version:\n";
print Dumper $versions;
$self->log->debug("Got Back Version: %s",Dumper ($versions));

my $highest_proto_supported = "1.99";
my $proto_to_use = 0;

foreach my $ver ( @{$versions} ){
print "Version: ". $ver ."\n";
$self->log->debug("Version: %s", $ver);

if( ! looks_like_number($ver) ){
print "*** $ver is not a version number\n";
$self->log->warn("*** %s is not a version number",$ver);
next;
}

Expand All @@ -315,11 +361,11 @@ sub request_protocol_versions {
$ver >= $proto_to_use
){
$proto_to_use = $ver;
print "Currently selected Protocol Version: ". $ver ."\n";
$self->log->debug("Currently selected Protocol Version: %s", $ver);
}
} # end foreach $ver

$self->protocol_version( $proto_to_use );
$self->protocol_version( $proto_to_use );

my $protocol_obj;

Expand All @@ -328,7 +374,7 @@ sub request_protocol_versions {
&&
$proto_to_use < 2.0
){
$protocol_obj = FileSync::SyncDiff::Protocol::v1->new( socket => $self->socket, version => $proto_to_use, dbref => $self->dbref, group => $self->group, hostname => $host, groupbase => $self->groupbase );
$protocol_obj = FileSync::SyncDiff::Protocol::v1->new( socket => $self->socket, version => $proto_to_use, dbref => $self->dbref, group => $self->group, hostname => $host, groupbase => $self->groupbase, log => $self->log );
}

$protocol_obj->setup();
Expand Down Expand Up @@ -380,17 +426,17 @@ sub basic_send_request {

chomp( $line );

print "Basic send receive line back:\n";
print Dumper $line;
$self->log->debug("Basic send receive line back:");
$self->log->debug(Dumper $line);

if( $line eq "0" ){
return 0;
}

my $response = decode_json( $line );

print Dumper $response;
print "Ref: ". ref( $response ). "\n";
$self->log->debug('Response: %s', Dumper ($response));
$self->log->debug("Ref: %s", ref( $response ));

if( ref( $response ) eq "ARRAY" ){
return $response;
Expand All @@ -411,8 +457,6 @@ sub basic_send_request {
return $response;
} # end send_request()

#no moose;
__PACKAGE__->meta->make_immutable;
#__PACKAGE__->meta->make_immutable(inline_constructor => 0,);

1;
Loading