From c2a1e58ef2655d51367e99e51418d965f8012555 Mon Sep 17 00:00:00 2001 From: Alan Liddeke Date: Fri, 1 Feb 2019 13:32:13 -0800 Subject: [PATCH] Address PR comments. --- .../main/java/com/netflix/msl/msg/MessageInputStream.java | 7 ++----- core/src/main/javascript/MslError.js | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/netflix/msl/msg/MessageInputStream.java b/core/src/main/java/com/netflix/msl/msg/MessageInputStream.java index ec54deb3..85378d8d 100644 --- a/core/src/main/java/com/netflix/msl/msg/MessageInputStream.java +++ b/core/src/main/java/com/netflix/msl/msg/MessageInputStream.java @@ -277,13 +277,10 @@ public MessageInputStream(final MslContext ctx, final InputStream source, final if (masterToken.isExpired(null)) { // If the message is not renewable or does not contain key // request data then reject the message. - if (!messageHeader.isRenewable()) { + if (!messageHeader.isRenewable()) throw new MslMessageException(MslError.MESSAGE_EXPIRED_NOT_RENEWABLE, messageHeader.toString()); - } - else if (messageHeader.getKeyRequestData().isEmpty()) { + else if (messageHeader.getKeyRequestData().isEmpty()) throw new MslMessageException(MslError.MESSAGE_EXPIRED_NO_KEYREQUEST_DATA, messageHeader.toString()); - } - // If the master token will not be renewed by the token // factory then reject the message. diff --git a/core/src/main/javascript/MslError.js b/core/src/main/javascript/MslError.js index 613f6005..86f5af2a 100644 --- a/core/src/main/javascript/MslError.js +++ b/core/src/main/javascript/MslError.js @@ -269,8 +269,8 @@ UNEXPECTED_LOCAL_MESSAGE_SENDER : new MslError(6041, MslConstants.ResponseCode.FAIL, "Message sender is equal to the local entity."), UNENCRYPTED_MESSAGE_WITH_USERAUTHDATA : new MslError(6042, MslConstants.ResponseCode.FAIL, "User authentication data included in unencrypted message header."), MESSAGE_SENDER_MISMATCH : new MslError(6043, MslConstants.ResponseCode.FAIL, "Message sender entity identity does not match expected identity."), - MESSAGE_EXPIRED_NOT_RENEWABLE : new MslError(6044, MslConstants.ResponseCode.EXPIRED, "Message expired and not renewable. Rejected."), - MESSAGE_EXPIRED_NO_KEYREQUEST_DATA : new MslError(6045, MslConstants.ResponseCode.EXPIRED, "Message expired and missing key request data. Rejected."), + MESSAGE_EXPIRED_NOT_RENEWABLE : new MslError(6044, MslConstants.ResponseCode.EXPIRED, "Message expired and not renewable. Rejected."), + MESSAGE_EXPIRED_NO_KEYREQUEST_DATA : new MslError(6045, MslConstants.ResponseCode.EXPIRED, "Message expired and missing key request data. Rejected."), // 7 Key Exchange UNIDENTIFIED_KEYX_SCHEME : new MslError(7000, MslConstants.ResponseCode.FAIL, "Unable to identify key exchange scheme."),