Changeset 1275 for pjproject/trunk/pjnath/src/pjnath/stun_session.c

Timestamp:

May 15, 2007 10:42:56 AM (17 years ago)

Author:

bennylp

Message:

Fixed several STUN bugs: USERNAME, REALM etc are not allowed in the response, retransmission timer calculation bug, etc.

File:

• pjproject/trunk/pjnath/src/pjnath/stun_session.c (modified) (23 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -212 +212 @@
 }
 
-static pj_str_t *get_passwd(pj_stun_session *sess, pj_pool_t *pool,
-                            const pj_stun_msg *msg)
+static pj_status_t get_key(pj_stun_session *sess, pj_pool_t *pool,
+                           const pj_stun_msg *msg, pj_str_t *auth_key)
 {
     if (sess->cred == NULL) {
-        return NULL;
+        auth_key->slen = 0;
+        return PJ_SUCCESS;
     } else if (sess->cred->type == PJ_STUN_AUTH_CRED_STATIC) {
-        return &sess->cred->data.static_cred.data;
+        pj_stun_create_key(pool, auth_key, 
+                           &sess->cred->data.static_cred.realm,
+                           &sess->cred->data.static_cred.username,
+                           &sess->cred->data.static_cred.data);
+        return PJ_SUCCESS;
     } else if (sess->cred->type == PJ_STUN_AUTH_CRED_DYNAMIC) {
         pj_str_t realm, username, nonce;
@@ -232 +237 @@
                                                        &nonce, &data_type,
                                                        password);
-        return password;
+        if (status != PJ_SUCCESS)
+            return status;
+
+        pj_stun_create_key(pool, auth_key, 
+                           &realm, &username, password);
+
+        return PJ_SUCCESS;
 
     } else {
-        return NULL;
+        pj_assert(!"Unknown credential type");
+        return PJ_EBUG;
     }
 }
@@ -244 +256 @@
 {
     pj_status_t status = 0;
+    pj_bool_t need_auth;
     pj_str_t realm, username, nonce, password;
     int data_type = 0;
@@ -250 +263 @@
 
     /* The server SHOULD include a SERVER attribute in all responses */
-    if (sess->srv_name.slen && (PJ_STUN_IS_SUCCESS_RESPONSE(msg->hdr.type) ||
-                                PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type))) 
-    {
+    if (sess->srv_name.slen && PJ_STUN_IS_RESPONSE(msg->hdr.type)) {
         pj_stun_msg_add_string_attr(pool, msg, PJ_STUN_ATTR_SERVER,
                                     &sess->srv_name);
     }
 
-    /* From draft-ietf-behave-rfc3489bis-05.txt
-     * Section 8.3.1.  Formulating the Request Message
-     *
-     * Note: only put MESSAGE-INTEGRITY in non error response.
-     */
+    need_auth = PJ_STUN_IS_REQUEST(msg->hdr.type) ||
+                PJ_STUN_IS_SUCCESS_RESPONSE(msg->hdr.type);
+
     if (sess->cred && sess->cred->type == PJ_STUN_AUTH_CRED_STATIC &&
-        !PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type)) 
+        need_auth)
     {
         realm = sess->cred->data.static_cred.realm;
@@ -272 +281 @@
 
     } else if (sess->cred && sess->cred->type == PJ_STUN_AUTH_CRED_DYNAMIC &&
-               !PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type)) 
+               need_auth) 
     {
         void *user_data = sess->cred->data.dyn_cred.user_data;
@@ -285 +294 @@
 
 
-    /* Create and add USERNAME attribute */
-    if (username.slen) {
+    /* Create and add USERNAME attribute for */
+    if (username.slen && PJ_STUN_IS_REQUEST(msg->hdr.type)) {
         status = pj_stun_msg_add_string_attr(pool, msg,
                                              PJ_STUN_ATTR_USERNAME,
@@ -294 +303 @@
 
     /* Add REALM only when long term credential is used */
-    if (realm.slen) {
+    if (realm.slen &&  PJ_STUN_IS_REQUEST(msg->hdr.type)) {
         status = pj_stun_msg_add_string_attr(pool, msg,
                                             PJ_STUN_ATTR_REALM,
@@ -302 +311 @@
 
     /* Add NONCE when desired */
-    if (nonce.slen) {
+    if (nonce.slen && 
+        (PJ_STUN_IS_REQUEST(msg->hdr.type) ||
+         PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type))) 
+    {
         status = pj_stun_msg_add_string_attr(pool, msg,
                                             PJ_STUN_ATTR_NONCE,
@@ -309 +321 @@
 
     /* Add MESSAGE-INTEGRITY attribute */
-    if (username.slen) {
+    if (username.slen && need_auth) {
         status = pj_stun_msg_add_msgint_attr(pool, msg);
         PJ_ASSERT_RETURN(status==PJ_SUCCESS, status);
@@ -509 +521 @@
  * Create a STUN response message.
  */
-PJ_DEF(pj_status_t) pj_stun_session_create_response( pj_stun_session *sess,
-                                                     const pj_stun_msg *req,
-                                                     unsigned err_code,
-                                                     const pj_str_t *err_msg,
-                                                     pj_stun_tx_data **p_tdata)
+PJ_DEF(pj_status_t) pj_stun_session_create_res( pj_stun_session *sess,
+                                                const pj_stun_msg *req,
+                                                unsigned err_code,
+                                                const pj_str_t *err_msg,
+                                                pj_stun_tx_data **p_tdata)
 {
     pj_status_t status;
@@ -598 +610 @@
     }
 
+    status = get_key(sess, tdata->pool, tdata->msg, &tdata->auth_key);
+    if (status != PJ_SUCCESS) {
+        pj_stun_msg_destroy_tdata(sess, tdata);
+        pj_mutex_unlock(sess->mutex);
+        LOG_ERR_(sess, "Error getting creadential's key", status);
+        return status;
+    }
+
     /* Encode message */
     status = pj_stun_msg_encode(tdata->msg, (pj_uint8_t*)tdata->pkt, 
                                 tdata->max_len, 0, 
-                                get_passwd(sess, tdata->pool, tdata->msg),
+                                &tdata->auth_key,
                                 &tdata->pkt_size);
     if (status != PJ_SUCCESS) {
@@ -738 +758 @@
 static pj_status_t send_response(pj_stun_session *sess, 
                                  pj_pool_t *pool, pj_stun_msg *response,
+                                 const pj_str_t *auth_key,
                                  pj_bool_t retransmission,
                                  const pj_sockaddr_t *addr, unsigned addr_len)
@@ -758 +779 @@
     /* Encode */
     status = pj_stun_msg_encode(response, out_pkt, out_max_len, 0, 
-                                get_passwd(sess, pool, response),
-                                &out_len);
+                                auth_key, &out_len);
     if (status != PJ_SUCCESS) {
         LOG_ERR_(sess, "Error encoding message", status);
@@ -775 +795 @@
 
 /* Authenticate incoming message */
-static pj_status_t authenticate_msg(pj_stun_session *sess,
+static pj_status_t authenticate_req(pj_stun_session *sess,
                                     const pj_uint8_t *pkt,
                                     unsigned pkt_len,
@@ -789 +809 @@
         return PJ_SUCCESS;
 
-    status = pj_stun_verify_credential(pkt, pkt_len, msg, sess->cred,
-                                       tmp_pool, &response);
+    status = pj_stun_authenticate_request(pkt, pkt_len, msg, sess->cred,
+                                          tmp_pool, &response);
     if (status != PJ_SUCCESS && response != NULL) {
         PJ_LOG(5,(SNAME(sess), "Message authentication failed"));
-        send_response(sess, tmp_pool, response, PJ_FALSE, 
+        send_response(sess, tmp_pool, response, NULL, PJ_FALSE, 
                       src_addr, src_addr_len);
     }
@@ -803 +823 @@
 /* Handle incoming response */
 static pj_status_t on_incoming_response(pj_stun_session *sess,
+                                        unsigned options,
+                                        const pj_uint8_t *pkt,
+                                        unsigned pkt_len,
                                         pj_stun_msg *msg,
                                         const pj_sockaddr_t *src_addr,
@@ -816 +839 @@
                   "Transaction not found, response silently discarded"));
         return PJ_SUCCESS;
+    }
+
+    /* Authenticate the message, unless PJ_STUN_NO_AUTHENTICATE
+     * is specified in the option.
+     */
+    if ((options & PJ_STUN_NO_AUTHENTICATE) == 0) {
+        status = pj_stun_authenticate_response(pkt, pkt_len, msg, &tdata->auth_key);
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(5,(SNAME(sess), 
+                      "Response authentication failed"));
+            return status;
+        }
     }
 
@@ -867 +902 @@
                  "Request retransmission, sending cached response"));
 
-        send_response(sess, tmp_pool, t->msg, PJ_TRUE, 
+        send_response(sess, tmp_pool, t->msg, &t->auth_key, PJ_TRUE, 
                       src_addr, src_addr_len);
         return PJ_SUCCESS;
@@ -877 +912 @@
 /* Handle incoming request */
 static pj_status_t on_incoming_request(pj_stun_session *sess,
+                                       unsigned options,
                                        pj_pool_t *tmp_pool,
                                        const pj_uint8_t *in_pkt,
@@ -886 +922 @@
     pj_status_t status;
 
+    /* Authenticate the message, unless PJ_STUN_NO_AUTHENTICATE
+     * is specified in the option.
+     */
+    if ((options & PJ_STUN_NO_AUTHENTICATE) == 0) {
+        status = authenticate_req(sess, (const pj_uint8_t*) in_pkt, in_pkt_len,
+                                  msg, tmp_pool, src_addr, src_addr_len);
+        if (status != PJ_SUCCESS) {
+            return status;
+        }
+    }
+
     /* Distribute to handler, or respond with Bad Request */
     if (sess->cb.on_rx_request) {
@@ -898 +945 @@
         if (status == PJ_SUCCESS && response) {
             status = send_response(sess, tmp_pool, response, 
-                                   PJ_FALSE, src_addr, src_addr_len);
+                                   NULL, PJ_FALSE, src_addr, src_addr_len);
         }
     }
@@ -953 +1000 @@
         LOG_ERR_(sess, "STUN msg_decode() error", status);
         if (response) {
-            send_response(sess, tmp_pool, response, 
+            send_response(sess, tmp_pool, response, NULL,
                           PJ_FALSE, src_addr, src_addr_len);
         }
@@ -978 +1025 @@
     }
 
-    /* Authenticate the message, unless PJ_STUN_NO_AUTHENTICATE
-     * is specified in the option.
-     */
-    if ((options & PJ_STUN_NO_AUTHENTICATE) == 0) {
-        status = authenticate_msg(sess, (const pj_uint8_t*) packet, pkt_size, 
-                                  msg, tmp_pool, src_addr, src_addr_len);
-        if (status != PJ_SUCCESS) {
-            goto on_return;
-        }
-    }
-
     /* Handle message */
     if (PJ_STUN_IS_SUCCESS_RESPONSE(msg->hdr.type) ||
         PJ_STUN_IS_ERROR_RESPONSE(msg->hdr.type))
     {
-        status = on_incoming_response(sess, msg, src_addr, src_addr_len);
+        status = on_incoming_response(sess, options, 
+                                      (const pj_uint8_t*) packet, pkt_size, 
+                                      msg, src_addr, src_addr_len);
 
     } else if (PJ_STUN_IS_REQUEST(msg->hdr.type)) {
 
-        status = on_incoming_request(sess, tmp_pool, 
+        status = on_incoming_request(sess, options, tmp_pool, 
                                      (const pj_uint8_t*) packet, pkt_size, 
                                      msg, src_addr, src_addr_len);