-
Notifications
You must be signed in to change notification settings - Fork 886
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Instant Stream Resumption implementation #92
Open
ramabit
wants to merge
8
commits into
igniterealtime:master
Choose a base branch
from
esl:ramabit.isr
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6cb89e7
Instant Stream Resumption implementation
ramabit f5e3416
fix hmac exceptions catch
ramabit fc8fe24
improve hmac digest and add test
ramabit f1e9311
merge update
ramabit a618b5a
merge update
ramabit 681d56b
merge update
ramabit a21a884
merge update
ramabit 662f1c3
merge update
ramabit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
smack-tcp/src/main/java/org/jivesoftware/smack/isr/HMAC.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/** | ||
* | ||
* Copyright © 2016 Fernando Ramirez | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.jivesoftware.smack.isr; | ||
|
||
import java.io.UnsupportedEncodingException; | ||
import java.security.InvalidKeyException; | ||
import java.security.NoSuchAlgorithmException; | ||
|
||
import javax.crypto.Mac; | ||
import javax.crypto.spec.SecretKeySpec; | ||
|
||
/** | ||
* Instant Stream Resumption HMAC class. | ||
* | ||
* @author Fernando Ramirez | ||
* @see <a href="http://xmpp.org/extensions/inbox/isr.html">XEP-xxxx: Instant | ||
* Stream Resumption</a> | ||
* | ||
*/ | ||
public class HMAC { | ||
|
||
public static String hmacDigest(String msg, String keyString, String algo) { | ||
String digest = null; | ||
try { | ||
SecretKeySpec key = new SecretKeySpec((keyString).getBytes("UTF-8"), algo); | ||
Mac mac = Mac.getInstance(algo); | ||
mac.init(key); | ||
|
||
byte[] bytes = mac.doFinal(msg.getBytes("ASCII")); | ||
|
||
StringBuffer hash = new StringBuffer(); | ||
for (int i = 0; i < bytes.length; i++) { | ||
String hex = Integer.toHexString(0xFF & bytes[i]); | ||
if (hex.length() == 1) { | ||
hash.append('0'); | ||
} | ||
hash.append(hex); | ||
} | ||
digest = hash.toString(); | ||
} catch (UnsupportedEncodingException | InvalidKeyException | NoSuchAlgorithmException e) { | ||
throw new IllegalStateException("HMAC digest couldn't be done correctly."); | ||
} | ||
return digest; | ||
} | ||
} |
49 changes: 49 additions & 0 deletions
49
smack-tcp/src/main/java/org/jivesoftware/smack/isr/ISRUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/** | ||
* | ||
* Copyright © 2016 Fernando Ramirez | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.jivesoftware.smack.isr; | ||
|
||
import java.io.IOException; | ||
|
||
import org.jivesoftware.smack.isr.element.InstantStreamResumption; | ||
import org.xmlpull.v1.XmlPullParser; | ||
import org.xmlpull.v1.XmlPullParserException; | ||
|
||
/** | ||
* Instant Stream Resumption utils. | ||
* | ||
* @author Fernando Ramirez | ||
* @see <a href="http://xmpp.org/extensions/inbox/isr.html">XEP-xxxx: Instant | ||
* Stream Resumption</a> | ||
* | ||
*/ | ||
public class ISRUtils { | ||
|
||
/** | ||
* Check if is a nonza from Instant Stream Resumption. | ||
* | ||
* @param parser | ||
* @return true if is a nonza from Instant Stream Resumption | ||
* @throws XmlPullParserException | ||
* @throws IOException | ||
*/ | ||
public static boolean isISRNonza(XmlPullParser parser) throws XmlPullParserException, IOException { | ||
String isrNamespace = parser.getNamespace(InstantStreamResumption.NAMESPACE_PREFIX); | ||
return (isrNamespace != null && isrNamespace.equals(InstantStreamResumption.NAMESPACE)) | ||
|| parser.getNamespace().equals(InstantStreamResumption.NAMESPACE); | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the catched Exception to the ISE, so that it doesn't get lost:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Flowdalic done