Merge remote-tracking branch 'upstream/master' into feature/fuzzing

open62541 · Jul 19, 2017 · 798a3e7 · 798a3e7
2 parents f920d1d + 18913ea
commit 798a3e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
@@ -56,7 +56,7 @@ activateSession_default(const UA_NodeId *sessionId,
        &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
         const UA_UserNameIdentityToken *token =
             (UA_UserNameIdentityToken*)userIdentityToken->content.decoded.data;
-        if(!UA_String_equal(&token->policyId, &username_policy))
+        if(!UA_String_equal(&token->policyId, &username_policy) || token->encryptionAlgorithm.length > 0)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
         /* Empty username and password */

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
@@ -260,6 +260,7 @@ addVariableNode(UA_Server *server, UA_UInt32 nodeid, char* name, UA_Int32 valueR
     attr.displayName = UA_LOCALIZEDTEXT("en_US", name);
     attr.dataType = *dataType;
     attr.valueRank = valueRank;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ;
     if(value)
         attr.value = *value;
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(0, nodeid), UA_NODEID_NUMERIC(0, parentid),