Add duration format as a constant

pitbulk · pitbulk · commit b4cf36dedde1 · 2021-02-08T17:01:56.000+01:00
diff --git a/lib/onelogin/ruby-saml/utils.rb b/lib/onelogin/ruby-saml/utils.rb
@@ -15,6 +15,7 @@ class Utils
 
       DSIG      = "http://www.w3.org/2000/09/xmldsig#"
       XENC      = "http://www.w3.org/2001/04/xmlenc#"
+      DURATION_FORMAT = %r(^(-?)P(?:(?:(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?)|(?:(\d+)W))$)
 
       # Checks if the x509 cert provided is expired
       #
@@ -38,7 +39,7 @@ def self.is_cert_expired(cert)
       # @return [Integer] The new timestamp, after the duration is applied.
       # 
       def self.parse_duration(duration, timestamp=Time.now)
-        matches = duration.match(/^(-?)P(?:(?:(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?)|(?:(\d+)W))$/)
+        matches = duration.match(DURATION_FORMAT)
       
         if matches.nil?
           raise Exception.new("Invalid ISO 8601 duration")

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class Utils`
`15`	`15`
`16`	`16`	`DSIG = "http://www.w3.org/2000/09/xmldsig#"`
`17`	`17`	`XENC = "http://www.w3.org/2001/04/xmlenc#"`
	`18`	`+ DURATION_FORMAT = %r(^(-?)P(?:(?:(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?)\|(?:(\d+)W))$)`
`18`	`19`
`19`	`20`	`# Checks if the x509 cert provided is expired`
`20`	`21`	`#`
`@@ -38,7 +39,7 @@ def self.is_cert_expired(cert)`
`38`	`39`	`# @return [Integer] The new timestamp, after the duration is applied.`
`39`	`40`	`#`
`40`	`41`	`def self.parse_duration(duration, timestamp=Time.now)`
`41`		`- matches = duration.match(/^(-?)P(?:(?:(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?)\|(?:(\d+)W))$/)`
	`42`	`+ matches = duration.match(DURATION_FORMAT)`
`42`	`43`
`43`	`44`	`if matches.nil?`
`44`	`45`	`raise Exception.new("Invalid ISO 8601 duration")`