Merge branch 'auth' of https://github.com/l2dy/opensips into l2dy-auth

Some improvements:

    * preserve the former behavior of returning a "Username Not Found"
      SIP error when the "username" or "password" PVs are not populated

    * return an internal error when the PVs contain unexpected values
      and/or types (e.g. NULL or non-string)

    * improve coding style in pv_authorize()

Author: liviuchircu

modules/auth/auth_mod.c

@@ -382,7 +382,7 @@ static inline int auth_get_ha1(struct sip_msg *msg, struct username* _username,
 				|| (sval.flags&PV_VAL_EMPTY) || (!(sval.flags&PV_VAL_STR)))
 		{
 			pv_value_destroy(&sval);
-			return 1;
+			return -1;
 		}
 		if(sval.rs.len!= _username->whole.len
 				|| strncasecmp(sval.rs.s, _username->whole.s, sval.rs.len))
@@ -403,7 +403,7 @@ static inline int auth_get_ha1(struct sip_msg *msg, struct username* _username,
 				|| (sval.flags&PV_VAL_EMPTY) || (!(sval.flags&PV_VAL_STR)))
 		{
 			pv_value_destroy(&sval);
-			return 1;
+			return -1;
 		}
 	} else {
 		return 1;
@@ -442,14 +442,13 @@ static inline int pv_authorize(struct sip_msg* msg, str *domain,
 	cred = (auth_body_t*)h->parsed;
 
 	res = auth_get_ha1(msg, &cred->digest.username, domain, ha1);
-	if (res != 0) {
+	if (res < 0) {
 		/* Error */
-		if (sigb.reply(msg, 500, &auth_500_err, NULL) == -1) {
+		if (sigb.reply(msg, 500, &auth_500_err, NULL) == -1)
 			LM_ERR("failed to send 500 reply\n");
-		}
+
 		return ERROR;
-	}
-	if (res > 0) {
+	} else if (res > 0) {
 		/* Username not found */
 		return USER_UNKNOWN;
 	}