Browse Source

fix bugs

tags/2.0.1
Jonathan Cobb 5 years ago
parent
commit
00bc337910
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      src/main/java/org/cobbzilla/util/dns/DnsRecordMatch.java
  2. +1
    -1
      src/main/java/org/cobbzilla/util/security/ShaUtil.java

+ 4
- 1
src/main/java/org/cobbzilla/util/dns/DnsRecordMatch.java View File

@@ -49,7 +49,10 @@ public class DnsRecordMatch extends DnsRecordBase {


public boolean matches (DnsRecord record) { public boolean matches (DnsRecord record) {
if (hasType() && !getType().equals(record.getType())) return false; if (hasType() && !getType().equals(record.getType())) return false;
if (hasFqdn() && !getFqdn().equalsIgnoreCase(record.getFqdn())) return false;
if (hasFqdn() && !getFqdn().equalsIgnoreCase(record.getFqdn())
&& (!record.getFqdn().startsWith(".") || !getFqdn().equalsIgnoreCase(record.getFqdn().substring(1)))) {
return false;
}
if (hasSubdomain() && record.hasFqdn() && !record.getFqdn().toLowerCase().endsWith(getSubdomain().toLowerCase())) return false; if (hasSubdomain() && record.hasFqdn() && !record.getFqdn().toLowerCase().endsWith(getSubdomain().toLowerCase())) return false;
if (hasPattern() && record.hasFqdn() && !get_pattern().matcher(record.getFqdn()).find()) return false; if (hasPattern() && record.hasFqdn() && !get_pattern().matcher(record.getFqdn()).find()) return false;
if (hasFqdns() && record.hasFqdn() && getFqdns().stream().noneMatch(f -> record.getFqdn().equalsIgnoreCase(f))) return false; if (hasFqdns() && record.hasFqdn() && getFqdns().stream().noneMatch(f -> record.getFqdn().equalsIgnoreCase(f))) return false;


+ 1
- 1
src/main/java/org/cobbzilla/util/security/ShaUtil.java View File

@@ -29,7 +29,7 @@ public class ShaUtil {


public static byte[] sha256 (String data) { public static byte[] sha256 (String data) {
try { try {
return sha256(data.getBytes(StringUtil.UTF8));
return sha256(data.getBytes(StringUtil.UTF8cs));
} catch (Exception e) { } catch (Exception e) {
return die("sha256: bad data: "+e, e); return die("sha256: bad data: "+e, e);
} }


Loading…
Cancel
Save