[PATCH] OpenVPN: Fix upload check for root and host certificate

[PATCH] OpenVPN: Fix upload check for root and host certificate

[Erik Kapfer]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

Fix for #11766 .
Since the new OpenSSL output differs in the 'Subject' section, the regex needed to be adapted.
Old and new output should now be possible.

Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index b3122a4..947cbe9 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -4045,7 +4045,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	    }
 
 	    my $temp = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;
-	    $temp =~ /Subject:.*CN=(.*)[\n]/;
+	    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
 	    $temp = $1;
 	    $temp =~ s+/Email+, E+;
 	    $temp =~ s/ ST=/ S=/;
@@ -4099,7 +4099,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	    }
 
 	    my $temp = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;
-	    $temp =~ /Subject:.*CN=(.*)[\n]/;
+	    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
 	    $temp = $1;
 	    $temp =~ s+/Email+, E+;
 	    $temp =~ s/ ST=/ S=/;
-- 
2.7.4

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]

Merged.

We are on fire today!

On Mon, 2018-06-18 at 17:10 +0200, Erik Kapfer wrote:
> Fix for #11766 .
> Since the new OpenSSL output differs in the 'Subject' section, the regex
> needed to be adapted.
> Old and new output should now be possible.
> 
> Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
> ---
>  html/cgi-bin/ovpnmain.cgi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> index b3122a4..947cbe9 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -4045,7 +4045,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
>  	    }
>  
>  	    my $temp = `/usr/bin/openssl x509 -text -in
> ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;
> -	    $temp =~ /Subject:.*CN=(.*)[\n]/;
> +	    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
>  	    $temp = $1;
>  	    $temp =~ s+/Email+, E+;
>  	    $temp =~ s/ ST=/ S=/;
> @@ -4099,7 +4099,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
>  	    }
>  
>  	    my $temp = `/usr/bin/openssl x509 -text -in
> ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;
> -	    $temp =~ /Subject:.*CN=(.*)[\n]/;
> +	    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
>  	    $temp = $1;
>  	    $temp =~ s+/Email+, E+;
>  	    $temp =~ s/ ST=/ S=/;

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

Actually. It doesn't apply against next... Can you check why?

On Mon, 2018-06-18 at 16:46 +0100, Michael Tremer wrote:
> Merged.
> 
> We are on fire today!
> 
> On Mon, 2018-06-18 at 17:10 +0200, Erik Kapfer wrote:
> > Fix for #11766 .
> > Since the new OpenSSL output differs in the 'Subject' section, the regex
> > needed to be adapted.
> > Old and new output should now be possible.
> > 
> > Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
> > ---
> >  html/cgi-bin/ovpnmain.cgi | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> > index b3122a4..947cbe9 100644
> > --- a/html/cgi-bin/ovpnmain.cgi
> > +++ b/html/cgi-bin/ovpnmain.cgi
> > @@ -4045,7 +4045,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
> >  	    }
> >  
> >  	    my $temp = `/usr/bin/openssl x509 -text -in
> > ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;
> > -	    $temp =~ /Subject:.*CN=(.*)[\n]/;
> > +	    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
> >  	    $temp = $1;
> >  	    $temp =~ s+/Email+, E+;
> >  	    $temp =~ s/ ST=/ S=/;
> > @@ -4099,7 +4099,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
> >  	    }
> >  
> >  	    my $temp = `/usr/bin/openssl x509 -text -in
> > ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;
> > -	    $temp =~ /Subject:.*CN=(.*)[\n]/;
> > +	    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
> >  	    $temp = $1;
> >  	    $temp =~ s+/Email+, E+;
> >  	    $temp =~ s/ ST=/ S=/;

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[ummeegge]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

upps got a lot of conflicts,
but got an mail from patchwork that the last two patches has been
updated ? Should i nevertheless go for another commit ?

And yes we are on (IP)Fire :D ,

Best,

Erik

Am Montag, den 18.06.2018, 16:52 +0100 schrieb Michael Tremer:
> Actually. It doesn't apply against next... Can you check why?
> 
> On Mon, 2018-06-18 at 16:46 +0100, Michael Tremer wrote:
> > 
> > Merged.
> > 
> > We are on fire today!
> > 

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

?

On Mon, 2018-06-18 at 18:30 +0200, ummeegge wrote:
> upps got a lot of conflicts,
> but got an mail from patchwork that the last two patches has been
> updated ? Should i nevertheless go for another commit ?
> 
> And yes we are on (IP)Fire :D ,
> 
> Best,
> 
> Erik
> 
> Am Montag, den 18.06.2018, 16:52 +0100 schrieb Michael Tremer:
> > Actually. It doesn't apply against next... Can you check why?
> > 
> > On Mon, 2018-06-18 at 16:46 +0100, Michael Tremer wrote:
> > > 
> > > Merged.
> > > 
> > > We are on fire today!
> > > 
> 
> 

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[ummeegge]

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

You´ve wrote before that the patch didn´t applied against next, is this
still the case ? Should i deliver it again ?

Am Dienstag, den 19.06.2018, 11:40 +0100 schrieb Michael Tremer:
> ?
> 

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

Yes please. I did not check why that is, so please double-check that we
apply what is needed :)

-Michael

On Tue, 2018-06-19 at 14:02 +0200, ummeegge wrote:
> You´ve wrote before that the patch didn´t applied against next, is this
> still the case ? Should i deliver it again ?
> 
> Am Dienstag, den 19.06.2018, 11:40 +0100 schrieb Michael Tremer:
> > ?
> > 
> 
> 

Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

[ummeegge]

[-- Attachment #1: Type: text/plain, Size: 769 bytes --]

Have changed yesterday the dev working dir and can not reproduce this
one. Pulled the new changes and wanted to deliver this patch again but
it is already included also all patches seems to be included too,
currently not sure what happens there...

It seems that here is everything applied...


Am Dienstag, den 19.06.2018, 14:01 +0100 schrieb Michael Tremer:
> Yes please. I did not check why that is, so please double-check that
> we
> apply what is needed :)
> 
> -Michael
> 
> On Tue, 2018-06-19 at 14:02 +0200, ummeegge wrote:
> > 
> > You´ve wrote before that the patch didn´t applied against next, is
> > this
> > still the case ? Should i deliver it again ?
> > 
> > Am Dienstag, den 19.06.2018, 11:40 +0100 schrieb Michael Tremer:
> > > 
> > > ?
> > > 
> >