From b778d29dd9d88d47a913300d96e5a24762a3b1f1 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 5 Feb 2019 01:45:19 +0100
Subject: [PATCH] admin: allow certid to finish by .p12, to permit downloading
 .p12 file

---
 admin/api/handlers.go             | 3 ++-
 admin/static/views/pki.html       | 2 +-
 admin/static/views/team-edit.html | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/admin/api/handlers.go b/admin/api/handlers.go
index 3eee1d75..2be16b34 100644
--- a/admin/api/handlers.go
+++ b/admin/api/handlers.go
@@ -8,6 +8,7 @@ import (
 	"log"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"srs.epita.fr/fic-server/libfic"
@@ -317,7 +318,7 @@ func fileHandler(f func(fic.EFile, []byte) (interface{}, error)) func(httprouter
 
 func certificateHandler(f func(fic.Certificate, []byte) (interface{}, error)) func(httprouter.Params, []byte) (interface{}, error) {
 	return func(ps httprouter.Params, body []byte) (interface{}, error) {
-		if certid, err := strconv.ParseUint(string(ps.ByName("certid")), 10, 64); err != nil {
+		if certid, err := strconv.ParseUint(strings.TrimSuffix(string(ps.ByName("certid")), ".p12"), 10, 64); err != nil {
 			return nil, err
 		} else if cert, err := fic.GetCertificate(certid); err != nil {
 			return nil, err
diff --git a/admin/static/views/pki.html b/admin/static/views/pki.html
index 6edc57d1..41031b26 100644
--- a/admin/static/views/pki.html
+++ b/admin/static/views/pki.html
@@ -28,7 +28,7 @@
       </td>
       <td>{{ certificate.revoked }}</td>
       <td>
-	<a type="button" class="btn btn-sm btn-success" href="api/certs/{{ certificate.id }}" target="_self">Télécharger</a>
+	<a type="button" class="btn btn-sm btn-success" href="api/certs/{{ certificate.id }}.p12" target="_self">Télécharger</a>
 	<button type="button" class="btn btn-sm btn-danger" data-toggle="modal" data-target="#revokeModal" data-certificate="{{ certificate.id }}" ng-class="{disabled: certificate.revoked}">Révoquer</button>
       </td>
     </tr>
diff --git a/admin/static/views/team-edit.html b/admin/static/views/team-edit.html
index c480e823..26a6b1c7 100644
--- a/admin/static/views/team-edit.html
+++ b/admin/static/views/team-edit.html
@@ -89,7 +89,7 @@
 	</dd>
 	<dt>
 	  Date de création
-	  <a class="btn btn-sm btn-success float-right" href="api/certs/{{ cert.id }}">Télécharger</a>
+	  <a class="btn btn-sm btn-success float-right" href="api/certs/{{ cert.id }}.p12" target="_self">Télécharger</a>
 	</dt>
 	<dd>{{ cert.creation }}</dd>
 	<dt>Mot de passe</dt>