From 45626bf96d1f7939048793cc7d24ef6d1e7b5f6a Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Thu, 15 Apr 2021 19:02:24 +0800
Subject: [PATCH] fix(emqx_coap): return unauthorized when username/password
 error

---
 apps/emqx_coap/README.md                         | 10 +++++-----
 apps/emqx_coap/src/emqx_coap_pubsub_resource.erl |  2 +-
 apps/emqx_coap/src/emqx_coap_resource.erl        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/emqx_coap/README.md b/apps/emqx_coap/README.md
index 927666358..1a9ee802c 100644
--- a/apps/emqx_coap/README.md
+++ b/apps/emqx_coap/README.md
@@ -151,7 +151,7 @@ To subscribe any topic, issue following command:
 - if clientid is absent, a "bad_request" will be returned.
 - {topicname} in URI should be percent-encoded to prevent special characters, such as + and #.
 - {username} and {password} are optional.
-- if {username} or {password} is incorrect, the error code `uauthorized` will be returned.
+- if {username} or {password} is incorrect, the error code `unauthorized` will be returned.
 - topic is subscribed with qos1.
 - if the subscription failed due to ACL deny, the error code `forbidden` will be returned.
 
@@ -169,7 +169,7 @@ To cancel observation, issue following command:
 - if clientid is absent, a "bad_request" will be returned.
 - {topicname} in URI should be percent-encoded to prevent special characters, such as + and #.
 - {username} and {password} are optional.
-- if {username} or {password} is incorrect, the error code `uauthorized` will be returned.
+- if {username} or {password} is incorrect, the error code `unauthorized` will be returned.
 
 CoAP Client Notification Operation (subscribed Message)
 -------------------------------------------------------
@@ -192,7 +192,7 @@ Issue a coap put command to publish messages. For example:
 - if clientid is absent, a "bad_request" will be returned.
 - {topicname} in URI should be percent-encoded to prevent special characters, such as + and #.
 - {username} and {password} are optional.
-- if {username} or {password} is incorrect, the error code `uauthorized` will be returned.
+- if {username} or {password} is incorrect, the error code `unauthorized` will be returned.
 - payload could be any binary data.
 - payload data type is "application/octet-stream".
 - publish message will be sent with qos0.
@@ -211,7 +211,7 @@ Device should issue a get command periodically, serve as a ping to keep mqtt ses
 - {any_topicname} is optional, and should be percent-encoded to prevent special characters.
 - {clientid} is mandatory. If clientid is absent, a "bad_request" will be returned.
 - {username} and {password} are optional.
-- if {username} or {password} is incorrect, the error code `uauthorized` will be returned.
+- if {username} or {password} is incorrect, the error code `unauthorized` will be returned.
 - coap client should do keepalive work periodically to keep mqtt session online, especially those devices in a NAT network.
 
 
@@ -231,7 +231,7 @@ ClientId, Username, Password and Topic
 ClientId/username/password/topic in the coap URI are the concepts in mqtt. That is to say, emqx-coap is trying to fit coap message into mqtt system, by borrowing the client/username/password/topic from mqtt.
 
 The Auth/ACL/Hook features in mqtt also applies on coap stuff. For example:
-- If username/password is not authorized, coap client will get an uauthorized error.
+- If username/password is not authorized, coap client will get an unauthorized error.
 - If username or clientid is not allowed to published specific topic, coap message will be dropped in fact, although coap client will get an acknoledgement from emqx-coap.
 - If a coap message is published, a 'message.publish' hook is able to capture this message as well.
 
diff --git a/apps/emqx_coap/src/emqx_coap_pubsub_resource.erl b/apps/emqx_coap/src/emqx_coap_pubsub_resource.erl
index da066bb36..d31bee613 100644
--- a/apps/emqx_coap/src/emqx_coap_pubsub_resource.erl
+++ b/apps/emqx_coap/src/emqx_coap_pubsub_resource.erl
@@ -65,7 +65,7 @@ coap_get(ChId, ?PS_PREFIX, TopicPath, Query, Content=#coap_content{format = Form
             end;
         {error, auth_failure} ->
             put(mqtt_client_pid, undefined),
-            {error, uauthorized};
+            {error, unauthorized};
         {error, bad_request} ->
             put(mqtt_client_pid, undefined),
             {error, bad_request};
diff --git a/apps/emqx_coap/src/emqx_coap_resource.erl b/apps/emqx_coap/src/emqx_coap_resource.erl
index e46317347..ca0d0567b 100644
--- a/apps/emqx_coap/src/emqx_coap_resource.erl
+++ b/apps/emqx_coap/src/emqx_coap_resource.erl
@@ -56,7 +56,7 @@ coap_get(ChId, ?MQTT_PREFIX, Path, Query, _Content) ->
             #coap_content{};
         {error, auth_failure} ->
             put(mqtt_client_pid, undefined),
-            {error, forbidden};
+            {error, unauthorized};
         {error, bad_request} ->
             put(mqtt_client_pid, undefined),
             {error, bad_request};