|
|
@ -2239,22 +2239,11 @@ public class MessageHelper {
|
|
|
|
if (headers == null || headers.length == 0)
|
|
|
|
if (headers == null || headers.length == 0)
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
|
|
|
|
|
|
|
|
String signer = null;
|
|
|
|
|
|
|
|
for (String header : headers) {
|
|
|
|
for (String header : headers) {
|
|
|
|
String v = getKeyValues(header).get(type);
|
|
|
|
String v = getKeyValues(header).get(type);
|
|
|
|
if (v == null)
|
|
|
|
if (v == null)
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
if (signer == null)
|
|
|
|
|
|
|
|
signer = getSigner(header);
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
String signer2 = getSigner(header);
|
|
|
|
|
|
|
|
if (!signer.equals(signer2)) {
|
|
|
|
|
|
|
|
Log.i("Different signer=" + signer + "/" + signer2 + " type=" + type);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String[] val = v.split("[^A-za-z]+");
|
|
|
|
String[] val = v.split("[^A-za-z]+");
|
|
|
|
if (val.length == 0)
|
|
|
|
if (val.length == 0)
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
@ -2264,14 +2253,14 @@ public class MessageHelper {
|
|
|
|
Log.i("Authentication " + type + "=" + value + " header=" + header);
|
|
|
|
Log.i("Authentication " + type + "=" + value + " header=" + header);
|
|
|
|
switch (value) {
|
|
|
|
switch (value) {
|
|
|
|
case "none":
|
|
|
|
case "none":
|
|
|
|
return null;
|
|
|
|
break;
|
|
|
|
case "pass":
|
|
|
|
case "pass":
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
case "fail":
|
|
|
|
case "fail":
|
|
|
|
case "policy":
|
|
|
|
case "policy":
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
case "neutral":
|
|
|
|
case "neutral":
|
|
|
|
return null;
|
|
|
|
break;
|
|
|
|
case "temperror":
|
|
|
|
case "temperror":
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
case "permerror":
|
|
|
|
case "permerror":
|
|
|
|