Skip to content

SPARK-2366: Use Smack HttpFileUploadManager instead of own implementation #956

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.

Sign up for GitHub

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

Open
stokito wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SPARK-2366: Use Smack HttpFileUploadManager instead of own implementation #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 8 additions & 68 deletions .../fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,35 @@

package org.jivesoftware.spark.plugin.fileupload;

import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.io.entity.FileEntity;
import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.MessageBuilder;
import org.jivesoftware.smack.packet.StanzaBuilder;
import org.jivesoftware.smack.packet.StandardExtensionElement;
import org.jivesoftware.spark.SessionManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager;
import org.jivesoftware.spark.component.RolloverButton;
import org.jivesoftware.spark.ui.ChatRoom;
import org.jivesoftware.spark.util.GraphicUtils;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.updater.AcceptAllCertsConnectionManager;
import org.jxmpp.jid.impl.JidCreate;

import javax.swing.*;
import java.awt.*;
import java.io.*;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.nio.file.Files;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hc.core5.http.ContentType.APPLICATION_OCTET_STREAM;
import static org.jivesoftware.smack.packet.Message.Type.groupchat;
import static org.jivesoftware.smack.packet.Message.Type.chat;

public class ChatRoomDecorator {
private final RolloverButton fileuploadButton;
private final HttpFileUploadManager httpFileUploadManager;
private final RolloverButton fileuploadButton;
private final ChatRoom room;

public ChatRoomDecorator(final ChatRoom room) {
public ChatRoomDecorator(HttpFileUploadManager httpFileUploadManager, final ChatRoom room) {
this.httpFileUploadManager = httpFileUploadManager;
this.room = room;
// Adds file upload button to chat room
fileuploadButton = new RolloverButton(SparkRes.getImageIcon("UPLOAD_ICON"));
Expand Down Expand Up @@ -105,22 +95,9 @@ private void getUploadUrl(ChatRoom room, Message.Type type) {

private void handleUpload(File file, ChatRoom room, Message.Type type) {
Log.debug("Uploading file: " + file.getAbsolutePath());
String fileName = URLEncoder.encode(file.getName(), UTF_8);
String mimeType = guessContentType(file);
try {
UploadRequest request = new UploadRequest(fileName, file.length(), mimeType);
SessionManager sessionManager = SparkManager.getSessionManager();
sessionManager.getDiscoveredItems().getItems();
String uploadEndpoint = "httpfileupload." + sessionManager.getServerAddress();
request.setTo(JidCreate.fromOrThrowUnchecked(uploadEndpoint));
request.setType(IQ.Type.get);

IQ result = SparkManager.getConnection().createStanzaCollectorAndSend(request).nextResultOrThrow();
UploadRequest response = (UploadRequest) result;
Log.debug("handleUpload response: putUrl=" + response.putUrl + " getUrl=" + response.getUrl);
if (response.putUrl != null) {
uploadFile(file, mimeType, response, room, type);
}
URL uploadedFile = httpFileUploadManager.uploadFile(file);
broadcastUploadUrl(uploadedFile.toString(), type);
} catch (Exception e) {
Log.error("Error while attempting to uploading file", e);
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
Expand All @@ -131,43 +108,6 @@ private void handleUpload(File file, ChatRoom room, Message.Type type) {
}
}

private void uploadFile(File file, String mimeType, UploadRequest response, ChatRoom room, Message.Type type) {
Log.debug("About to upload file for room " + room.getBareJid() + " via HTTP PUT to URL " + response.putUrl);
ContentType contentType = mimeType != null ? ContentType.create(mimeType) : APPLICATION_OCTET_STREAM;
try (final CloseableHttpClient httpClient =
HttpClients.custom().useSystemProperties()
.setConnectionManager(AcceptAllCertsConnectionManager.getInstance())
.setUserAgent("Spark HttpFileUpload")
.build()
) {
final ClassicHttpRequest request = ClassicRequestBuilder.put(response.putUrl)
.setEntity(new FileEntity(file, contentType))
.build();

httpClient.execute(request, httpResponse -> {
try {
final int statusCode = httpResponse.getCode();
final String reasonPhrase = httpResponse.getReasonPhrase();
if ((statusCode >= 200) && (statusCode <= 202)) {
Log.debug("Upload file success. HTTP response: " + statusCode + " " + reasonPhrase);
broadcastUploadUrl(response.getUrl, type);
} else {
throw new IllegalStateException("Server responded to upload request with: " + statusCode + ": " + reasonPhrase);
}
} catch (Exception e) {
Log.error("Error encountered whilst uploading the file", e);
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane.showMessageDialog(room, "Upload failed: " + e.getMessage(), "Http File Upload Plugin", JOptionPane.ERROR_MESSAGE);
}
return null;
});
} catch (Exception e) {
Log.error("Error encountered whilst uploading the file", e);
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane.showMessageDialog(room, "Upload failed: " + e.getMessage(), "Http File Upload Plugin", JOptionPane.ERROR_MESSAGE);
}
}

private void broadcastUploadUrl(String url, Message.Type type) {
MessageBuilder messageBuilder = StanzaBuilder.buildMessage()
.ofType(type)
Expand Down
31 changes: 22 additions & 9 deletions ...eupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/SparkFileUploadPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,43 @@

package org.jivesoftware.spark.plugin.fileupload;

import org.jivesoftware.smack.AbstractXMPPConnection;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager;
import org.jivesoftware.spark.ChatManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.ui.ChatRoom;
import org.jivesoftware.spark.ui.ChatRoomListener;
import org.jivesoftware.spark.ui.GlobalMessageListener;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.smack.provider.ProviderManager;
import org.jxmpp.jid.EntityJid;

import java.util.*;


public class SparkFileUploadPlugin implements Plugin, ChatRoomListener, GlobalMessageListener {
private HttpFileUploadManager httpFileUploadManager;
private ChatManager chatManager;
private final Map<EntityJid, ChatRoomDecorator> decorators = new HashMap<>();

@Override
public void initialize() {
ProviderManager.addIQProvider("slot", UploadRequest.NAMESPACE, new UploadRequest.Provider());
//TODO Use our cert manager httpFileUploadManager.setTlsContext()
AbstractXMPPConnection connection = SparkManager.getConnection();
httpFileUploadManager = HttpFileUploadManager.getInstanceFor(connection);
if (!httpFileUploadManager.isUploadServiceDiscovered()) {
Log.warning("HTTP File Upload service not discovered.");
httpFileUploadManager = null;
return;
}
chatManager = SparkManager.getChatManager();
chatManager.addChatRoomListener(this);
chatManager.addGlobalMessageListener(this);
}

@Override
public void messageReceived(ChatRoom room, Message message) {
String body = message.getBody();
if (body != null && (body.startsWith("https://") || body.startsWith("http://")) && body.contains("/httpfileupload/")) {
Log.warning("http file upload get url " + message.getBody());
}
}

@Override
Expand All @@ -57,12 +62,14 @@ public void messageSent(ChatRoom room, Message message) {

@Override
public void shutdown() {
if (httpFileUploadManager == null) {
return;
}
try {
Log.debug("shutdown");
chatManager.removeChatRoomListener(this);
chatManager.removeGlobalMessageListener(this);
chatManager = null;
ProviderManager.removeIQProvider("slot", UploadRequest.NAMESPACE);
httpFileUploadManager = null;
} catch (Exception e) {
Log.warning("shutdown ", e);
}
Expand All @@ -83,6 +90,9 @@ public void chatRoomLeft(ChatRoom chatroom) {

@Override
public void chatRoomClosed(ChatRoom chatroom) {
if (httpFileUploadManager == null) {
return;
}
EntityJid roomId = chatroom.getJid();
Log.debug("chatRoomClosed: " + roomId);
if (decorators.containsKey(roomId)) {
Expand All @@ -105,10 +115,13 @@ public void userHasLeft(ChatRoom room, String s) {

@Override
public void chatRoomOpened(final ChatRoom room) {
if (httpFileUploadManager == null) {
return;
}
EntityJid roomId = room.getJid();
Log.debug("chatRoomOpened: " + roomId);
if (!decorators.containsKey(roomId)) {
decorators.put(roomId, new ChatRoomDecorator(room));
decorators.put(roomId, new ChatRoomDecorator(httpFileUploadManager, room));
}
}

Expand Down
90 changes: 0 additions & 90 deletions plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/UploadRequest.java
View file
Open in desktop

This file was deleted.