Merge pull request #1388 from isimluk/fix-link-to-rh-errata

Fix URL link mechanism for Red Hat Errata

Author: jan-cerny

xsl/oval-to-xccdf.xsl

@@ -86,9 +86,9 @@ Authors:
     </xsl:template>
 
     <xsl:template match="oval-def:reference[@source='RHSA']">
-        <xsl:if test="starts-with(@ref_url, 'https://rhn.redhat.com/errata')">
-            <xccdf:ident system="https://rhn.redhat.com/errata">
-                <xsl:copy-of select="substring-before(substring-after(@ref_url, 'https://rhn.redhat.com/errata/'), '.html')"/>
+        <xsl:if test="starts-with(@ref_url, 'https://access.redhat.com/errata')">
+            <xccdf:ident system="https://access.redhat.com/errata">
+                <xsl:copy-of select="substring-after(@ref_url, 'https://access.redhat.com/errata/')"/>
             </xccdf:ident>
         </xsl:if>
     </xsl:template>

xsl/xccdf-share.xsl

@@ -55,8 +55,8 @@ Authors:
         <xsl:when test="starts-with(@system, 'http://cve.mitre.org')">
             <a href="{concat('https://cve.mitre.org/cgi-bin/cvename.cgi?name=', text())}"><abbr title="{concat(@system, concat(': ', text()))}"><xsl:value-of select="text()"/></abbr></a>
         </xsl:when>
-        <xsl:when test="starts-with(@system, 'https://rhn.redhat.com/errata')">
-            <a href="{concat('https://rhn.redhat.com/errata/', concat(text(), '.html'))}"><abbr title="{concat(@system, concat(': ', text()))}"><xsl:value-of select="text()"/></abbr></a>
+        <xsl:when test="starts-with(@system, 'https://access.redhat.com/errata')">
+            <a href="{concat('https://access.redhat.com/errata/', concat(text(), '.html'))}"><abbr title="{concat(@system, concat(': ', text()))}"><xsl:value-of select="text()"/></abbr></a>
         </xsl:when>
         <xsl:otherwise>
             <abbr title="{concat(@system, concat(': ', text()))}"><xsl:value-of select="text()"/></abbr>