diff --git a/src/App/Validation/DNS.purs b/src/App/Validation/DNS.purs index e205875..e049801 100644 --- a/src/App/Validation/DNS.purs +++ b/src/App/Validation/DNS.purs @@ -15,7 +15,7 @@ import App.Type.ResourceRecord (MechanismType(..), ModifierType(..)) as RR import GenericParser.SomeParsers as SomeParsers import GenericParser.Parser as G import GenericParser.DomainParser.Common (DomainError) as DomainParser -import GenericParser.DomainParser (wildcard, wildcard_eof, sub_eof) as DomainParser +import GenericParser.DomainParser (name, sub_eof) as DomainParser import GenericParser.IPAddress as IPAddress import GenericParser.RFC5234 as RFC5234 @@ -23,10 +23,6 @@ import App.Type.DKIM as DKIM import App.Type.DMARC as DMARC import App.Type.CAA as CAA --- | `name_parser` parses `name` attributes of RRs. -name_parser :: G.Parser DomainParser.DomainError String -name_parser = DomainParser.wildcard <|> DomainParser.wildcard_eof <|> DomainParser.sub_eof - -- | **History:** -- | The module once used dedicated types for each type of RR. -- | That comes with several advantages. @@ -122,7 +118,7 @@ parse (G.Parser p) str c = case p { string: str, position: 0 } of validationA :: ResourceRecord -> V (Array Error) ResourceRecord validationA form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL target <- parse IPAddress.ipv4 form.target VEIPv4 in emptyRR { rrid = form.rrid, readonly = form.readonly, rrtype = "A", name = name, ttl = ttl, target = target @@ -130,7 +126,7 @@ validationA form = ado validationAAAA :: ResourceRecord -> V (Array Error) ResourceRecord validationAAAA form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL -- use read_input to get unaltered input (the IPv6 parser expands the input) target <- parse (G.read_input IPAddress.ipv6) form.target VEIPv6 @@ -139,21 +135,21 @@ validationAAAA form = ado validationTXT :: ResourceRecord -> V (Array Error) ResourceRecord validationTXT form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL target <- parse txt_parser form.target VETXT in emptyRR { rrid = form.rrid, readonly = form.readonly, rrtype = "TXT", name = name, ttl = ttl, target = target } validationCNAME :: ResourceRecord -> V (Array Error) ResourceRecord validationCNAME form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL target <- parse DomainParser.sub_eof form.target VECNAME in emptyRR { rrid = form.rrid, readonly = form.readonly, rrtype = "CNAME", name = name, ttl = ttl, target = target } validationNS :: ResourceRecord -> V (Array Error) ResourceRecord validationNS form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL target <- parse DomainParser.sub_eof form.target VENS in emptyRR { rrid = form.rrid, readonly = form.readonly, rrtype = "NS", name = name, ttl = ttl, target = target } @@ -165,7 +161,7 @@ is_between min max n ve = if between min max n validationMX :: ResourceRecord -> V (Array Error) ResourceRecord validationMX form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL target <- parse DomainParser.sub_eof form.target VEMX priority <- is_between min_priority max_priority (maybe 0 id form.priority) VEPriority @@ -174,7 +170,7 @@ validationMX form = ado validationSRV :: ResourceRecord -> V (Array Error) ResourceRecord validationSRV form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL target <- parse DomainParser.sub_eof form.target VESRV priority <- is_between min_priority max_priority (maybe 0 id form.priority) VEPriority @@ -256,7 +252,7 @@ validate_SPF_modifier m = case m.t of validationSPF :: ResourceRecord -> V (Array Error) ResourceRecord validationSPF form = ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL mechanisms <- verification_loop validate_SPF_mechanism (maybe [] id form.mechanisms) modifiers <- verification_loop validate_SPF_modifier (maybe [] id form.modifiers) @@ -299,7 +295,7 @@ validationDKIM :: ResourceRecord -> V (Array Error) ResourceRecord validationDKIM form = let dkim = fromMaybe DKIM.emptyDKIMRR form.dkim in ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL -- TODO: v n p <- verify_public_key (fromMaybe DKIM.RSA dkim.k) dkim.p @@ -313,7 +309,7 @@ validationDMARC :: ResourceRecord -> V (Array Error) ResourceRecord validationDMARC form = let dmarc = fromMaybe DMARC.emptyDMARCRR form.dmarc in ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL pct <- is_between 0 100 (fromMaybe 100 dmarc.pct) VEDMARCpct ri <- is_between 0 1000000 (fromMaybe 86400 dmarc.ri) VEDMARCri @@ -327,7 +323,7 @@ validationCAA :: ResourceRecord -> V (Array Error) ResourceRecord validationCAA form = let caa = fromMaybe CAA.emptyCAARR form.caa in ado - name <- parse name_parser form.name VEName + name <- parse DomainParser.name form.name VEName ttl <- is_between min_ttl max_ttl form.ttl VETTL flag <- is_between 0 255 caa.flag VECAAflag -- TODO: verify the `value` field.