From 074bc6a5a538124166ea505e379ad52e0391f5d8 Mon Sep 17 00:00:00 2001 From: "Scott T. Hardin" Date: Fri, 9 Oct 2015 13:27:35 +0200 Subject: [PATCH 1/3] fix duplicate var declaration in cgi script --- bin/keynanny.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/keynanny.cgi b/bin/keynanny.cgi index eaa42ff..e887850 100755 --- a/bin/keynanny.cgi +++ b/bin/keynanny.cgi @@ -165,7 +165,7 @@ else { die "Error reading encrypted password: $!"; } - my $encrypted_password = join( '', <$fh> ); + $encrypted_password = join( '', <$fh> ); close $fh; my $success = 1; From d76cb98ec5c67a4e97d8731e6f9e2c51459bd8aa Mon Sep 17 00:00:00 2001 From: "Scott T. Hardin" Date: Fri, 9 Oct 2015 13:54:03 +0200 Subject: [PATCH 2/3] keynanny.cgi: fix error in ticket_id --- bin/keynanny.cgi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/keynanny.cgi b/bin/keynanny.cgi index e887850..f0d2d2b 100755 --- a/bin/keynanny.cgi +++ b/bin/keynanny.cgi @@ -84,7 +84,9 @@ sub get_ticket_id { my ( $ticket_id, $ticket_file ); until ( $ticket_id && not -f $ticket_file ) { - $ticket_id = `openssl rand 48 | openssl sha1 | head -c 7`; + $ticket_id = `openssl rand 48 | openssl sha1`; + $ticket_id =~ s{^\(stdin\)=\s}{}; + $ticket_id = substr($ticket_id, 0, 7); $ticket_file = $config->{spooldir} . '/' . $ticket_id; chomp $ticket_id; From de822da706af6ea3f79b372e684b023709e1dd44 Mon Sep 17 00:00:00 2001 From: "Scott T. Hardin" Date: Wed, 22 Apr 2015 17:41:16 +0200 Subject: [PATCH 3/3] Add Build.PL and supporting files --- Build.PL | 20 +++++++++++++ MANIFEST.SKIP | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/KeyNanny.pm | 2 ++ 3 files changed, 96 insertions(+) create mode 100644 Build.PL create mode 100644 MANIFEST.SKIP diff --git a/Build.PL b/Build.PL new file mode 100644 index 0000000..bffcb5e --- /dev/null +++ b/Build.PL @@ -0,0 +1,20 @@ +use strict; +use warnings; +use Module::Build; +my $build = Module::Build->new( + dist_abstract => 'Credential protection and access control server', + dist_author => 'Martin Bartosch ', + module_name => 'KeyNanny', + license => 'apache', # TODO: add 'gpl' as dual-license + requires => { + 'Log::Log4perl' => 0, + 'IO::Socket::UNIX' => 0, + 'Moose' => 0, + }, + PL_files => {}, + share_dir => { + dist => [ 'examples', 'util', ], + } +); + +$build->create_build_script; diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP new file mode 100644 index 0000000..e581065 --- /dev/null +++ b/MANIFEST.SKIP @@ -0,0 +1,74 @@ + +# Avoid version control files. +\bRCS\b +\bCVS\b +\bSCCS\b +,v$ +\B\.svn\b +\B\.git\b +\B\.gitignore\b +\b_darcs\b +\B\.cvsignore$ + +# Avoid VMS specific MakeMaker generated files +\bDescrip.MMS$ +\bDESCRIP.MMS$ +\bdescrip.mms$ + +# Avoid Makemaker generated and utility files. +\bMANIFEST\.bak +\bMakefile$ +\bblib/ +\bMakeMaker-\d +\bpm_to_blib\.ts$ +\bpm_to_blib$ +\bblibdirs\.ts$ # 6.18 through 6.25 generated this + +# Avoid Module::Build generated and utility files. +\bBuild$ +\b_build/ +\bBuild.bat$ +\bBuild.COM$ +\bBUILD.COM$ +\bbuild.com$ + +# Avoid temp and backup files. +~$ +\.old$ +\#$ +\b\.# +\.bak$ +\.tmp$ +\.# +\.rej$ + +# Avoid OS-specific files/dirs +# Mac OSX metadata +\B\.DS_Store +# Mac OSX SMB mount metadata files +\B\._ + +# Avoid Devel::Cover and Devel::CoverX::Covered files. +\bcover_db\b +\bcovered\b + +# Avoid MYMETA files +^MYMETA\. + +# Avoid configuration metadata file +^MYMETA\. + +# Avoid Module::Build generated and utility files. +\bBuild$ +\bBuild.bat$ +\b_build +\bBuild.COM$ +\bBUILD.COM$ +\bbuild.com$ +^MANIFEST\.SKIP + +# Avoid archives of this distribution +\bKeyNanny-[\d\.\_]+ + +# Avoid other temporary files +\..*\.swp$ diff --git a/lib/KeyNanny.pm b/lib/KeyNanny.pm index ac48cfb..a77c075 100644 --- a/lib/KeyNanny.pm +++ b/lib/KeyNanny.pm @@ -12,6 +12,8 @@ use strict; use warnings; use English; +our $VERSION = 1.07; + use Carp; use Data::Dumper; use Log::Log4perl qw( :easy );