Merge branch 'release/v1.2.0'

Mifiel · Dec 11, 2019 · d4ec719 · d4ec719
2 parents 1670fcc + 191345e
commit d4ec719
Show file tree

Hide file tree

Showing 24 changed files with 777 additions and 178 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v10.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+# V1.2.0 - Encrypted documents - 10.Dec.2019
+- Add support for encrypted documents
+- Upgrade xml-fiesta-js with encrypted docs and several bug fixes
+
 # V1.1.6 - 2016 Conservancy Record - 10.Ago.2018
 - Add support for NOM 2016
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -86,6 +86,10 @@ module.exports = function (grunt) {
                 '/bower_components',
                 connect.static('./bower_components')
               ),
+              connect().use(
+                '/node_modules',
+                connect.static('./node_modules')
+              ),
               connect().use(
                 '/app/styles',
                 connect.static('./app/styles')
@@ -106,6 +110,10 @@ module.exports = function (grunt) {
                 '/bower_components',
                 connect.static('./bower_components')
               ),
+              connect().use(
+                '/node_modules',
+                connect.static('./node_modules')
+              ),
               connect.static(appConfig.app)
             ];
           }

diff --git a/app/index.html b/app/index.html
@@ -34,7 +34,7 @@
             </button>
 
             <a class="navbar-brand" ui-sref="verify">XML Fiesta </a>
-            <p class="version">v1.1.8</p>
+            <p class="version">v1.2.0</p>
           </div>
 
           <div class="collapse navbar-collapse" id="js-navbar-collapse">
@@ -83,6 +83,8 @@
     </script>
 
     <!-- build:js(.) scripts/vendor.js -->
+    <script src="node_modules/xml-fiesta/dist/xml-fiesta.js"></script>
+
     <!-- bower:js -->
     <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
@@ -109,7 +111,6 @@
     <script src="bower_components/angular-pdf/dist/angular-pdf.js"></script>
     <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
     <script src="bower_components/angular-local-storage/dist/angular-local-storage.js"></script>
-    <script src="bower_components/xml-fiesta/dist/xml-fiesta.js"></script>
     <script src="bower_components/angular-translate/angular-translate.js"></script>
     <!-- endbower -->
     <!-- endbuild -->

diff --git a/app/scripts/app.coffee b/app/scripts/app.coffee
@@ -27,6 +27,8 @@ angular
       .translations('es', TRANSLATIONS_ES)
       .preferredLanguage('es')
       .fallbackLanguage('en')
+      .useSanitizeValueStrategy('sanitizeParameters');
+
 
     $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|blob):/);
 

diff --git a/app/scripts/lang/en.coffee b/app/scripts/lang/en.coffee
@@ -5,4 +5,10 @@ angular.module 'xmlFiestaUiApp'
       VERIFY: 'Verify XML'
       CONTACT: 'Contact'
       CONFIGURATION: 'Configuration'
+    VERIFY:
+      ENCRYPT:
+        ALERT: "Since you loaded an <b>encrypted XML</b> of the signed document, we cannot validate the Original Hash or the Signature. To validate all fields, click on “Validate another document” and load the <b>decrypted XML</b> of the signed document."
+        HASH_NOT_AVAILABLE: "The original hash cannot be validated because the XML you loaded is encrypted."
+        SIGNATURE_NOT_AVAILABLE: "The signature cannot be validated because the XML you loaded is encrypted."
+        NOTE: "We can't show the contents of the signed document because the XML is encrypted. To visualize its contents, click on “Validate another document” and load the <b>decrypted XML</b> of the signed document."
   }
diff --git a/app/scripts/lang/es.coffee b/app/scripts/lang/es.coffee
@@ -31,6 +31,8 @@ angular.module 'xmlFiestaUiApp'
       WRONG_CERT: 'El certificado no fue firmado con ninguno de los certificados raíz que cargaste en la página de configuración. Asegúrate de haber cargado todos los certificados raíz de la autoridad que emitió el certificado usado para firmar. Si este error persiste significa que el certificado no fue emitido por la autoridad certificadora dueña de los certificados raíz.'
       WRONG_SIG: 'La Firma no es válida, pudo haber sido modificada o no se usó la llave privada correspondiente al certificado mencionado anteriormente.'
       LOADING: 'Validando documento...'
+      INFORMATION_DOCUMENT: 'Información identificadora del documento firmado'
+      INFORMATION_SIGNER: 'Información identificadora de cada firmante'
       CONSERVANCY_RECORD: 'Constancia de conservación'
       RECORD:
         ISSUER: 'Emisor'
@@ -40,7 +42,11 @@ angular.module 'xmlFiestaUiApp'
         WRONG_CR: 'La constancia de conservación en el XML no está presente o no tiene una esctructura válida.'
         WRONG_ARCHIVE: 'El documento o las firmas han sido modificados desde la emisión de la constancia.'
         VALID_ARCHIVE: 'La constancia de conservación coincide con documento y firmas.'
-
+      ENCRYPT:
+        ALERT: "Debido a que cargaste un <b>XML encriptado</b> del documento firmado, no podemos validar el Hash Original ni la Firma. Para validar todos los campos, presiona “Validar otro documento” y carga el <b>XML desencriptado</b> del documento firmado."
+        HASH_NOT_AVAILABLE: "El Hash Original no puede ser validado porque el XML que cargaste está encriptado."
+        SIGNATURE_NOT_AVAILABLE: "La firma no puede ser validada porque el XML que cargaste está encriptado."
+        NOTE: "No podemos mostrar el contenido del documento firmado porque el XML está encriptado. Para visualizar su contenido, presiona “Validar otro documento” y carga el <b>XML desencriptado</b> del documento firmado."
     FAQ:
       ABOUT: 'Acerca de'
       INTRO: 'XML Fiesta es una herramienta para validar Firmas Electrónicas Avanzadas.'

diff --git a/app/styles/upload.scss → app/styles/_upload.scss b/app/styles/upload.scss → app/styles/_upload.scss
diff --git a/app/styles/_verify.scss b/app/styles/_verify.scss
@@ -0,0 +1,44 @@
+
+.mi_VerifyXml {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  p {
+    margin: 0;
+  }
+
+  .alert-danger {
+    color: $mi-core-color-red-300;
+    background-color: $mi-core-color-red-050;
+    margin: $mi-core-spacing-2-x 0px;
+    border: 0;
+  }
+
+  .alert-warning {
+    color: $mi-core-color-neutral-650;
+    background-color: $mi-core-color-yellow-100;
+    border: 0;
+    width: 100%;
+  }
+
+  .btn-success {
+    color: $mi-core-color-neutral-000;
+    background-color: $mi-core-color-green-250;
+
+    &-hover {
+      background-color: $mi-components-button-appearance-primary-vexbi-hover-background-color;
+    }
+  }
+
+  &-attributeName {
+    color: $mi-core-color-neutral-350;
+  }
+
+  &-note {
+    max-width: 40rem;
+    margin: auto !important;
+  }
+}
diff --git a/app/styles/main.scss b/app/styles/main.scss
@@ -1,8 +1,10 @@
 $icon-font-path: "../bower_components/bootstrap-sass-official/assets/fonts/bootstrap/";
 // bower:scss
-@import "bootstrap-sass-official/assets/stylesheets/bootstrap.scss";
+@import 'bootstrap-sass-official/assets/stylesheets/bootstrap.scss';
 // endbower
+@import '../../node_modules/@nucleus/ui-tokens/dist/web/tokens.scss';
 
+@import 'utils/index';
 @import 'upload';
 @import 'verify';
 
@@ -16,7 +18,7 @@ $icon-font-path: "../bower_components/bootstrap-sass-official/assets/fonts/boots
 body {
   padding: 0;
   font-family: "Raleway", Arial, sans-serif;
-  color: #333;
+  color: $mi-core-color-neutral-450;
 }
 
 h1,
@@ -35,11 +37,11 @@ p {
 }
 
 a {
-  color: #2bb673;
-}
+  color: $mi-core-color-green-250;
 
-a:hover {
-  color: #333;
+  &:hover {
+    color: $mi-core-color-neutral-550;
+  }
 }
 
 .text-small {
@@ -51,9 +53,9 @@ a.unstyled{
 }
 
 .navbar-nav a:hover, .navbar-nav a.active {
-  color: #2bb673 !important;
+  color: $mi-core-color-green-250 !important;
   font-weight: 600;
-  border-bottom: 2px solid #2bb673 !important;
+  border-bottom: 2px solid $mi-core-color-green-250 !important;
 }
 
 .navbar.navbar-default {
@@ -246,7 +248,6 @@ button {
 }
 
 .verify {
-
   padding-top: 30px;
   padding-bottom: 120px;
 

diff --git a/app/styles/utils/_alignment.scss b/app/styles/utils/_alignment.scss
@@ -0,0 +1,15 @@
+.mi_u-textAlignCenter {
+  text-align: center !important;
+}
+
+.mi_u-textAlignLeft {
+  text-align: left !important;
+}
+
+.mi_u-textAlignRight {
+  text-align: right !important;
+}
+
+.mi_u-textAlignJustify {
+  text-align: justify !important;
+}
diff --git a/app/styles/utils/_colors.scss b/app/styles/utils/_colors.scss
@@ -0,0 +1,15 @@
+.mi_u-coreNeutral600 {
+  color: $mi-core-color-neutral-600 !important;
+}
+
+.mi_u-colorGreen300 {
+  color: $mi-core-color-green-300 !important;
+}
+
+.mi_u-colorYellow300 {
+  color: $mi-core-color-yellow-300 !important;
+}
+
+.mi_u-colorRed250 {
+  color: $mi-core-color-red-250 !important;
+}
diff --git a/app/styles/utils/_display.scss b/app/styles/utils/_display.scss
@@ -0,0 +1,11 @@
+.mi_u-block {
+  display: block !important;
+}
+
+.mi_u-inlineBlock {
+  display: inline-block !important;
+}
+
+.mi_u-none {
+  display: none !important;
+}
diff --git a/app/styles/utils/_index.scss b/app/styles/utils/_index.scss
@@ -0,0 +1,6 @@
+@import 'alignment';
+@import 'colors';
+@import 'display';
+@import 'others';
+@import 'spacing';
+@import 'text';
diff --git a/app/styles/utils/_others.scss b/app/styles/utils/_others.scss
@@ -0,0 +1,5 @@
+.mi_u-divider {
+  border-bottom: 0;
+  border-top: 1px solid $mi-core-color-neutral-100;
+  margin: $mi-core-spacing-2-x 0;
+}