From 4314d834724bbb5c671e7300b7de865fe53c51fb Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 8 Nov 2016 15:54:33 +0300 Subject: reorganize structure again --- .../src/main/java/com/juick/ws/ApiController.java | 6 +- .../src/main/java/com/juick/ws/XMPPConnection.java | 1 - .../java/com/juick/ws/api/WebSocketStatus.java | 19 - .../juick/ws/components/CrosspostComponent.java | 309 -------------- .../com/juick/ws/components/XMPPComponent.java | 461 --------------------- .../ws/configuration/WebsocketConfiguration.java | 10 - .../src/main/java/com/juick/ws/s2s/CacheEntry.java | 19 - .../src/main/java/com/juick/ws/s2s/CleaningUp.java | 109 ----- .../src/main/java/com/juick/ws/s2s/Connection.java | 149 ------- .../main/java/com/juick/ws/s2s/ConnectionIn.java | 227 ---------- .../main/java/com/juick/ws/s2s/ConnectionOut.java | 168 -------- .../src/main/java/com/juick/ws/s2s/DNSQueries.java | 47 --- .../src/main/java/com/juick/ws/s2s/JuickBot.java | 379 ----------------- 13 files changed, 3 insertions(+), 1901 deletions(-) delete mode 100644 juick-ws/src/main/java/com/juick/ws/api/WebSocketStatus.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/components/CrosspostComponent.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/components/XMPPComponent.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/CacheEntry.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/CleaningUp.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/Connection.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/ConnectionOut.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/DNSQueries.java delete mode 100644 juick-ws/src/main/java/com/juick/ws/s2s/JuickBot.java (limited to 'juick-ws') diff --git a/juick-ws/src/main/java/com/juick/ws/ApiController.java b/juick-ws/src/main/java/com/juick/ws/ApiController.java index 9adda912..5203de57 100644 --- a/juick-ws/src/main/java/com/juick/ws/ApiController.java +++ b/juick-ws/src/main/java/com/juick/ws/ApiController.java @@ -1,6 +1,6 @@ package com.juick.ws; -import com.juick.ws.api.WebSocketStatus; +import com.juick.server.helpers.Status; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -18,7 +18,7 @@ public class ApiController { @RequestMapping(value = "/api/status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) - public WebSocketStatus status() { - return new WebSocketStatus(wsHandler.clients.size()); + public Status status() { + return new Status(String.valueOf(wsHandler.clients.size())); } } diff --git a/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java index ea02db76..caeb5b21 100644 --- a/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java +++ b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java @@ -11,7 +11,6 @@ import com.juick.xmpp.extensions.JuickMessage; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.web.socket.TextMessage; diff --git a/juick-ws/src/main/java/com/juick/ws/api/WebSocketStatus.java b/juick-ws/src/main/java/com/juick/ws/api/WebSocketStatus.java deleted file mode 100644 index 82e15765..00000000 --- a/juick-ws/src/main/java/com/juick/ws/api/WebSocketStatus.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.juick.ws.api; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by vitalyster on 25.07.2016. - */ -public class WebSocketStatus { - private int clientsCount; - - public WebSocketStatus(int count) { - clientsCount = count; - } - - @JsonProperty("status") - public int getClientsCount() { - return clientsCount; - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/components/CrosspostComponent.java b/juick-ws/src/main/java/com/juick/ws/components/CrosspostComponent.java deleted file mode 100644 index dcb4a709..00000000 --- a/juick-ws/src/main/java/com/juick/ws/components/CrosspostComponent.java +++ /dev/null @@ -1,309 +0,0 @@ -/* - * Juick - * Copyright (C) 2013, Ugnich Anton - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package com.juick.ws.components; - -import com.juick.server.CrosspostQueries; -import com.juick.xmpp.JID; -import com.juick.xmpp.Message; -import com.juick.xmpp.Stream; -import com.juick.xmpp.StreamComponent; -import com.juick.xmpp.extensions.JuickMessage; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang3.math.NumberUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.Environment; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.datasource.DriverManagerDataSource; -import org.springframework.stereotype.Component; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import javax.inject.Inject; -import javax.net.ssl.HttpsURLConnection; -import java.io.*; -import java.net.Socket; -import java.net.URL; -import java.net.URLEncoder; -import java.security.Key; -import java.util.UUID; -import java.util.concurrent.ExecutorService; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * - * @author Ugnich Anton - */ -@Component -public class CrosspostComponent implements DisposableBean, Stream.StreamListener, Message.MessageListener { - - private static Logger logger = Logger.getLogger(CrosspostComponent.class.getName()); - - public final static String TWITTERURL = "https://api.twitter.com/1.1/statuses/update.json"; - public final static String FBURL = "https://graph.facebook.com/me/feed"; - public final static String VKURL = "https://api.vk.com/method/wall.post"; - @Inject - JdbcTemplate jdbc; - Stream xmpp; - String twitter_consumer_key; - String twitter_consumer_secret; - ExecutorService service; - - @Inject - public CrosspostComponent(Environment env, ExecutorService service) { - this.service = service; - logger.info("component initialized"); - try { - twitter_consumer_key = env.getProperty("twitter_consumer_key", ""); - twitter_consumer_secret = env.getProperty("twitter_consumer_secret", ""); - - setupXmppComponent(env.getProperty("crosspost_jid", "crosspost.juick.local"), - env.getProperty("xmpp_password", ""), NumberUtils.toInt(env.getProperty("xmpp_port", ""), 5347)); - service.submit(() -> xmpp.startParsing()); - } catch (Exception e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - } - - @Override - public void destroy() { - logger.info("component destroyed"); - } - - public void setupXmppComponent(String jid, String password, int port) { - try { - Socket socket = new Socket("localhost", port); - xmpp = new StreamComponent(new JID(jid), socket.getInputStream(), socket.getOutputStream(), password); - xmpp.addChildParser(new JuickMessage()); - xmpp.addListener((Stream.StreamListener) this); - xmpp.addListener((Message.MessageListener) this); - } catch (IOException e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - } - - @Override - public void onStreamReady() { - logger.info("XMPP STREAM READY"); - } - - @Override - public void onStreamFail(Exception e) {logger.log(Level.SEVERE, "XMPP STREAM FAIL", e);} - @Override - public void onMessage(com.juick.xmpp.Message msg) { - JuickMessage jmsg = (JuickMessage) msg.getChild(JuickMessage.XMLNS); - if (msg.to != null && msg.to.Username != null && jmsg != null && jmsg.getRID() == 0) { - if (msg.to.Username.equals("twitter")) { - twitterPost(jmsg); - } else if (msg.to.Username.equals("fb")) { - facebookPost(jmsg); - } else if (msg.to.Username.equals("vk")) { - vkontaktePost(jmsg); - } - } - } - - public boolean facebookPost(com.juick.Message jmsg) { - String token = CrosspostQueries.getFacebookToken(jdbc, jmsg.getUser().getUID()).orElse(""); - if (token.isEmpty()) { - return false; - } - - logger.info("FB: #" + jmsg.getMID()); - - String status = getMessageHashTags(jmsg) + "\n" + jmsg.getText(); - - boolean ret = false; - try { - String body = "access_token=" + URLEncoder.encode(token, "UTF-8") + "&message=" + URLEncoder.encode(status, "UTF-8") + "&link=http%3A%2F%2Fjuick.com%2F" + jmsg.getMID(); - - HttpsURLConnection conn = (HttpsURLConnection) new URL(FBURL).openConnection(); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - conn.setRequestProperty("User-Agent", "Juick"); - conn.setRequestProperty("Content-Length", Integer.toString(body.length())); - conn.setUseCaches(false); - conn.setDoInput(true); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.connect(); - - OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); - wr.write(body); - wr.close(); - - ret = streamToString(conn.getInputStream()) != null; - - conn.disconnect(); - } catch (Exception e) { - logger.log(Level.SEVERE, "fbPost: " + e.getMessage(), e); - } - return ret; - } - - public boolean vkontaktePost(com.juick.Message jmsg) { - Pair tokens = CrosspostQueries.getVKTokens(jdbc, jmsg.getUser().getUID()).orElse(Pair.of("", "")); - if (tokens.getLeft().isEmpty() || tokens.getRight().isEmpty()) { - return false; - } - - logger.info("VK: #" + jmsg.getMID()); - - String status = getMessageHashTags(jmsg) + "\n" + jmsg.getText() + "\nhttp://juick.com/" + jmsg.getMID(); - - boolean ret = false; - try { - String body = "owner_id=" + tokens.getLeft() + "&access_token=" + URLEncoder.encode(tokens.getRight(), "UTF-8") + "&from_group=1&message=" + URLEncoder.encode(status, "UTF-8"); - - HttpsURLConnection conn = (HttpsURLConnection) new URL(VKURL).openConnection(); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - conn.setRequestProperty("User-Agent", "Juick"); - conn.setRequestProperty("Content-Length", Integer.toString(body.length())); - conn.setUseCaches(false); - conn.setDoInput(true); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.connect(); - - OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); - wr.write(body); - wr.close(); - - ret = streamToString(conn.getInputStream()) != null; - - conn.disconnect(); - } catch (Exception e) { - logger.log(Level.SEVERE, "vkPost: " + e.getMessage(), e); - } - return ret; - } - - public boolean twitterPost(com.juick.Message jmsg) { - Pair tokens = CrosspostQueries.getTwitterTokens(jdbc, jmsg.getUser().getUID()).orElse(Pair.of("", "")); - if (tokens.getLeft().isEmpty() || tokens.getRight().isEmpty()) { - return false; - } - String token = percentEncode(tokens.getLeft()); - String token_secret = percentEncode(tokens.getRight()); - - logger.info("TWITTER: #" + jmsg.getMID()); - - String status = getMessageHashTags(jmsg) + jmsg.getText(); - if (status.length() > 115) { - status = status.substring(0, 114) + "…"; - } - status += " http://juick.com/" + jmsg.getMID(); - status = percentEncode(status); - - boolean ret = false; - try { - String nonce = UUID.randomUUID().toString(); - String timestamp = Long.toString(System.currentTimeMillis() / 1000L); - String signature = percentEncode(twitterSignature(status, nonce, timestamp, token, token_secret)); - String auth = "OAuth " - + "oauth_consumer_key=\"" + twitter_consumer_key + "\", " - + "oauth_nonce=\"" + nonce + "\", " - + "oauth_signature=\"" + signature + "\", " - + "oauth_signature_method=\"HMAC-SHA1\", " - + "oauth_timestamp=\"" + timestamp + "\", " - + "oauth_token=\"" + token + "\", " - + "oauth_version=\"1.0\""; - - HttpsURLConnection conn = (HttpsURLConnection) new URL(TWITTERURL).openConnection(); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - conn.setRequestProperty("User-Agent", "Juick"); - conn.setRequestProperty("Content-Length", Integer.toString(status.length() + 7)); - conn.setRequestProperty("Authorization", auth); - conn.setUseCaches(false); - conn.setDoInput(true); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.connect(); - - OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); - wr.write("status=" + status); - wr.close(); - - ret = streamToString(conn.getInputStream()) != null; - - conn.disconnect(); - } catch (Exception e) { - logger.log(Level.SEVERE, "twitterPost: " + e.getMessage(), e); - } - return ret; - } - - public String twitterSignature(String status, String nonce, String timestamp, String token, String token_secret) { - try { - // ALPHABET-SORTED - String params = "oauth_consumer_key=" + twitter_consumer_key - + "&oauth_nonce=" + nonce - + "&oauth_signature_method=HMAC-SHA1" - + "&oauth_timestamp=" + timestamp - + "&oauth_token=" + token - + "&oauth_version=1.0" - + "&status=" + status; - - String base = "POST&" + percentEncode(TWITTERURL) + "&" + percentEncode(params); - String key = twitter_consumer_secret + "&" + token_secret; - - Key signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1"); - Mac mac = Mac.getInstance("HmacSHA1"); - mac.init(signingKey); - byte[] rawHmac = mac.doFinal(base.getBytes()); - return Base64.encodeBase64String(rawHmac); - - } catch (Exception e) { - logger.log(Level.SEVERE, "twitterSignature: " + e.getMessage(), e); - } - return null; - } - - public String streamToString(InputStream is) { - try { - BufferedReader buf = new BufferedReader(new InputStreamReader(is)); - StringBuilder str = new StringBuilder(); - String line; - do { - line = buf.readLine(); - str.append(line).append("\n"); - } while (line != null); - return str.toString(); - } catch (Exception e) { - logger.log(Level.SEVERE, "streamToString: " + e.getMessage(), e); - } - return null; - } - - public String getMessageHashTags(com.juick.Message jmsg) { - String hashtags = ""; - for (int i = 0; i < jmsg.Tags.size(); i++) { - hashtags += "#" + jmsg.Tags.get(i) + " "; - } - return hashtags; - } - - public static String percentEncode(String s) { - String ret = ""; - try { - ret = URLEncoder.encode(s, "UTF-8").replace("+", "%20").replace("*", "%2A").replace("%7E", "~"); - } catch (UnsupportedEncodingException e) { - } - return ret; - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/components/XMPPComponent.java b/juick-ws/src/main/java/com/juick/ws/components/XMPPComponent.java deleted file mode 100644 index 2cc898ec..00000000 --- a/juick-ws/src/main/java/com/juick/ws/components/XMPPComponent.java +++ /dev/null @@ -1,461 +0,0 @@ -package com.juick.ws.components; - -import com.juick.User; -import com.juick.server.MessagesQueries; -import com.juick.server.SubscriptionsQueries; -import com.juick.server.UserQueries; -import com.juick.ws.s2s.*; -import com.juick.xmpp.*; -import com.juick.xmpp.extensions.JuickMessage; -import com.juick.xmpp.extensions.Nickname; -import com.juick.xmpp.extensions.XOOB; -import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.commons.lang3.math.NumberUtils; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.Environment; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import org.xmlpull.v1.XmlPullParserException; - -import javax.inject.Inject; -import java.io.IOException; -import java.net.ServerSocket; -import java.net.Socket; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * - * @author ugnich - */ -@Component -public class XMPPComponent implements DisposableBean, Stream.StreamListener, - Message.MessageListener, Iq.IqListener, Presence.PresenceListener { - - private static final Logger logger = Logger.getLogger(XMPPComponent.class.getName()); - - public ExecutorService service; - private StreamComponent router; - JuickBot bot; - - public String HOSTNAME, componentName; - public String STATSFILE = null; - public String keystore; - public String keystorePassword; - public List brokenSSLhosts; - public List bannedHosts; - private final List inConnections = Collections.synchronizedList(new ArrayList<>()); - private final List outConnections = Collections.synchronizedList(new ArrayList<>()); - private final List outCache = Collections.synchronizedList(new ArrayList<>()); - @Inject - public JdbcTemplate jdbc; - final public HashMap childParsers = new HashMap<>(); - - @Inject - public XMPPComponent(Environment env, ExecutorService service) { - this.service = service; - logger.info("component initialized"); - try { - HOSTNAME = env.getProperty("hostname"); - componentName = env.getProperty("componentname"); - int componentPort = NumberUtils.toInt(env.getProperty("component_port"), 5347); - int s2sPort = NumberUtils.toInt(env.getProperty("s2s_port"), 5269); - JID Jid = new JID(env.getProperty("xmppbot_jid")); - STATSFILE = env.getProperty("statsfile"); - keystore = env.getProperty("keystore"); - keystorePassword = env.getProperty("keystore_password"); - brokenSSLhosts = Arrays.asList(env.getProperty("broken_ssl_hosts", "").split(",")); - bannedHosts = Arrays.asList(env.getProperty("banned_hosts", "").split(",")); - bot = new JuickBot(this, Jid); - - childParsers.put(JuickMessage.XMLNS, new JuickMessage()); - - service.submit(() -> { - try { - Socket routerSocket = new Socket("localhost", componentPort); - router = new StreamComponent(new JID("s2s"), routerSocket.getInputStream(), routerSocket.getOutputStream(), env.getProperty("xmpp_password")); - router.addChildParser(new JuickMessage()); - router.addListener((Stream.StreamListener) this); - router.addListener((Message.MessageListener) this); - router.addListener((Iq.IqListener) this); - router.startParsing(); - } catch (IOException e) { - logger.log(Level.SEVERE, "router error", e); - } - }); - service.submit(() -> { - final ServerSocket listener = new ServerSocket(s2sPort); - logger.info("s2s listener ready"); - while (true) { - try { - Socket socket = listener.accept(); - ConnectionIn client = new ConnectionIn(this, bot, socket); - addConnectionIn(client); - service.submit(client); - } catch (Exception e) { - logger.log(Level.SEVERE, "s2s error", e); - } - } - }); - service.submit(new CleaningUp(this)); - - } catch (Exception e) { - logger.log(Level.SEVERE, "XMPPComponent error", e); - } - } - - public void addConnectionIn(ConnectionIn c) { - synchronized (getInConnections()) { - getInConnections().add(c); - } - } - - public void addConnectionOut(ConnectionOut c) { - synchronized (getOutConnections()) { - getOutConnections().add(c); - } - } - - public void removeConnectionIn(ConnectionIn c) { - synchronized (getInConnections()) { - getInConnections().remove(c); - } - } - - public void removeConnectionOut(ConnectionOut c) { - synchronized (getOutConnections()) { - getOutConnections().remove(c); - } - } - - public String getFromCache(String hostname) { - CacheEntry ret = null; - synchronized (getOutCache()) { - for (Iterator i = getOutCache().iterator(); i.hasNext();) { - CacheEntry c = i.next(); - if (c.hostname != null && c.hostname.equals(hostname)) { - ret = c; - i.remove(); - break; - } - } - } - return (ret != null) ? ret.xml : null; - } - - public ConnectionOut getConnectionOut(String hostname, boolean needReady) { - synchronized (getOutConnections()) { - for (ConnectionOut c : getOutConnections()) { - if (c.to != null && c.to.equals(hostname) && (!needReady || c.streamReady)) { - return c; - } - } - } - return null; - } - - public ConnectionIn getConnectionIn(String streamID) { - synchronized (getInConnections()) { - for (ConnectionIn c : getInConnections()) { - if (c.streamID != null && c.streamID.equals(streamID)) { - return c; - } - } - } - return null; - } - - public void sendOut(Stanza s) { - sendOut(s.to.Host, s.toString()); - } - - public void sendOut(String hostname, String xml) { - boolean haveAnyConn = false; - - ConnectionOut connOut = null; - synchronized (getOutConnections()) { - for (ConnectionOut c : getOutConnections()) { - if (c.to != null && c.to.equals(hostname)) { - if (c.streamReady) { - connOut = c; - break; - } else { - haveAnyConn = true; - break; - } - } - } - } - if (connOut != null) { - try { - connOut.sendStanza(xml); - } catch (IOException e) { - logger.warning("STREAM TO " + connOut.to + " " + connOut.streamID + " ERROR: " + e.toString()); - } - return; - } - - boolean haveCache = false; - synchronized (getOutCache()) { - for (CacheEntry c : getOutCache()) { - if (c.hostname != null && c.hostname.equals(hostname)) { - c.xml += xml; - c.tsUpdated = System.currentTimeMillis(); - haveCache = true; - break; - } - } - if (!haveCache) { - getOutCache().add(new CacheEntry(hostname, xml)); - } - } - - if (!haveAnyConn) { - try { - ConnectionOut connectionOut = new ConnectionOut(this, hostname); - service.submit(connectionOut); - } catch (CertificateException | UnrecoverableKeyException | NoSuchAlgorithmException | XmlPullParserException | KeyStoreException | KeyManagementException | IOException e) { - logger.log(Level.SEVERE, "s2s out error", e); - } - } - } - - - @Override - public void destroy() { - synchronized (getOutConnections()) { - for (Iterator i = getOutConnections().iterator(); i.hasNext();) { - ConnectionOut c = i.next(); - c.closeConnection(); - i.remove(); - } - } - - synchronized (getInConnections()) { - for (Iterator i = getInConnections().iterator(); i.hasNext();) { - ConnectionIn c = i.next(); - c.closeConnection(); - i.remove(); - } - } - - try { - closeRouterConnection(); - } catch (IOException e) { - logger.log(Level.WARNING, "router warning", e); - } - service.shutdown(); - logger.info("component destroyed"); - } - public void closeRouterConnection() throws IOException { - getRouter().logoff(); - } - - public void sendJuickMessage(JuickMessage jmsg) { - List jids = new ArrayList<>(); - - if (jmsg.FriendsOnly) { - jids = SubscriptionsQueries.getJIDSubscribedToUser(jdbc, jmsg.getUser().getUID(), jmsg.FriendsOnly); - } else { - List users = SubscriptionsQueries.getSubscribedUsers(jdbc, jmsg.getUser().getUID(), jmsg.getMID()); - for (User user : users) { - for (String jid : UserQueries.getJIDsbyUID(jdbc, user.getUID())) { - jids.add(jid); - } - } - } - - String txt = "@" + jmsg.getUser().getUName() + ":" + jmsg.getTagsString() + "\n"; - String attachment = jmsg.getAttachmentURL(); - if (attachment != null) { - txt += attachment + "\n"; - } - txt += jmsg.getText() + "\n\n"; - txt += "#" + jmsg.getMID() + " http://juick.com/" + jmsg.getMID(); - - Nickname nick = new Nickname(); - nick.Nickname = "@" + jmsg.getUser().getUName(); - - com.juick.xmpp.Message msg = new com.juick.xmpp.Message(); - msg.from = bot.JuickJID; - msg.body = txt; - msg.type = Message.Type.chat; - msg.thread = "juick-" + jmsg.getMID(); - msg.addChild(jmsg); - msg.addChild(nick); - if (attachment != null) { - XOOB oob = new XOOB(); - oob.URL = attachment; - msg.addChild(oob); - } - - for (String jid : jids) { - msg.to = new JID(jid); - sendOut(msg); - } - } - - public void sendJuickComment(JuickMessage jmsg) { - List users; - String replyQuote; - String replyTo; - - users = SubscriptionsQueries.getUsersSubscribedToComments(jdbc, jmsg.getMID(), jmsg.getUser().getUID()); - com.juick.Message replyMessage = jmsg.ReplyTo > 0 ? MessagesQueries.getReply(jdbc, jmsg.getMID(), jmsg.ReplyTo) - : MessagesQueries.getMessage(jdbc, jmsg.getMID()); - replyTo = replyMessage.getUser().getUName(); - replyQuote = getReplyQuote(replyMessage); - - String txt = "Reply by @" + jmsg.getUser().getUName() + ":\n" + replyQuote + "\n@" + replyTo + " "; - String attachment = jmsg.getAttachmentURL(); - if (attachment != null) { - txt += attachment + "\n"; - } - txt += jmsg.getText() + "\n\n" + "#" + jmsg.getMID() + "/" + jmsg.getRID() + " http://juick.com/" + jmsg.getMID() + "#" + jmsg.getRID(); - - com.juick.xmpp.Message msg = new com.juick.xmpp.Message(); - msg.from = bot.JuickJID; - msg.body = txt; - msg.type = Message.Type.chat; - msg.addChild(jmsg); - for (User user : users) { - for (String jid : UserQueries.getJIDsbyUID(jdbc, user.getUID())) { - msg.to = new JID(jid); - sendOut(msg); - } - } - } - - private String getReplyQuote(com.juick.Message q) { - String quote = q.getText(); - if (quote.length() > 50) { - quote = ">" + quote.substring(0, 47).replace('\n', ' ') + "...\n"; - } else if (quote.length() > 0) { - quote = ">" + quote.replace('\n', ' ') + "\n"; - } - return quote; - } - - public void sendJuickRecommendation(JuickMessage recomm) { - List users; - JuickMessage jmsg; - jmsg = new JuickMessage(MessagesQueries.getMessage(jdbc, recomm.getMID())); - users = SubscriptionsQueries.getUsersSubscribedToUserRecommendations(jdbc, - recomm.getUser().getUID(), recomm.getMID(), jmsg.getUser().getUID()); - - String txt = "Recommended by @" + recomm.getUser().getUName() + ":\n"; - txt += "@" + jmsg.getUser().getUName() + ":" + jmsg.getTagsString() + "\n"; - String attachment = jmsg.getAttachmentURL(); - if (attachment != null) { - txt += attachment + "\n"; - } - txt += jmsg.getText() + "\n\n"; - txt += "#" + jmsg.getMID(); - if (jmsg.Replies > 0) { - if (jmsg.Replies % 10 == 1 && jmsg.Replies % 100 != 11) { - txt += " (" + jmsg.Replies + " reply)"; - } else { - txt += " (" + jmsg.Replies + " replies)"; - } - } - txt += " http://juick.com/" + jmsg.getMID(); - - Nickname nick = new Nickname(); - nick.Nickname = "@" + jmsg.getUser().getUName(); - - com.juick.xmpp.Message msg = new com.juick.xmpp.Message(); - msg.from = bot.JuickJID; - msg.body = txt; - msg.type = Message.Type.chat; - msg.thread = "juick-" + jmsg.getMID(); - msg.addChild(jmsg); - msg.addChild(nick); - if (attachment != null) { - XOOB oob = new XOOB(); - oob.URL = attachment; - msg.addChild(oob); - } - - for (User user : users) { - for (String jid : UserQueries.getJIDsbyUID(jdbc, user.getUID())) { - msg.to = new JID(jid); - sendOut(msg); - } - } - } - - @Override - public boolean onIq(Iq iq) { - JID jid = iq.to; - if (!jid.Host.equals(componentName)) { - logger.info("STREAM ROUTER (IQ): " + iq.toString()); - sendOut(iq); - } - return false; - } - - @Override - public void onMessage(Message xmsg) { - logger.info("STREAM ROUTER (PROCESS): " + xmsg.toString()); - JuickMessage jmsg = (JuickMessage) xmsg.getChild(JuickMessage.XMLNS); - JID jid = xmsg.to; - if (jid.Host.equals(componentName)) { - if (jmsg != null) { - if (jid.Username != null && jid.Username.equals("recomm")) { - sendJuickRecommendation(jmsg); - } else { - if (jmsg.getRID() > 0) { - sendJuickComment(jmsg); - } else if (jmsg.getMID() > 0) { - sendJuickMessage(jmsg); - } - } - } - } else { - sendOut(xmsg); - } - } - - @Override - public void onPresence(Presence presence) { - JID jid = presence.to; - if (!jid.Host.equals(componentName)) { - logger.info("STREAM ROUTER (PRESENCE): " + presence.toString()); - sendOut(presence); - } - } - - @Override - public void onStreamReady() { - logger.info("STREAM ROUTER (READY)"); - } - - @Override - public void onStreamFail(Exception ex) { - logger.log(Level.SEVERE, "STREAM ROUTER (FAIL)", ex); - } - - public StreamComponent getRouter() { - return router; - } - - public List getInConnections() { - return inConnections; - } - - public List getOutConnections() { - return outConnections; - } - - public List getOutCache() { - return outCache; - } - -} diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java index 783865ed..c4395e29 100644 --- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java +++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.juick.ws.WebsocketComponent; import com.juick.ws.XMPPConnection; -import com.juick.ws.components.CrosspostComponent; -import com.juick.ws.components.XMPPComponent; import com.mitchellbosecke.pebble.PebbleEngine; import com.mitchellbosecke.pebble.loader.Loader; import com.mitchellbosecke.pebble.loader.ServletLoader; @@ -94,14 +92,6 @@ public class WebsocketConfiguration extends WebMvcConfigurationSupport implement return new XMPPConnection(env, service); } @Bean - public XMPPComponent xmpp() { - return new XMPPComponent(env, service); - } - @Bean - public CrosspostComponent crosspost() { - return new CrosspostComponent(env, service); - } - @Bean public ExecutorService service() { return Executors.newCachedThreadPool(); } diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/CacheEntry.java b/juick-ws/src/main/java/com/juick/ws/s2s/CacheEntry.java deleted file mode 100644 index e870e0d8..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/CacheEntry.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.juick.ws.s2s; - -/** - * - * @author ugnich - */ -public class CacheEntry { - - public String hostname; - public long tsCreated; - public long tsUpdated; - public String xml; - - public CacheEntry(String hostname, String xml) { - this.hostname = hostname; - this.tsCreated = this.tsUpdated = System.currentTimeMillis(); - this.xml = xml; - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/CleaningUp.java b/juick-ws/src/main/java/com/juick/ws/s2s/CleaningUp.java deleted file mode 100644 index 8140c829..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/CleaningUp.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.juick.ws.s2s; - -import com.juick.ws.components.XMPPComponent; - -import java.io.FileNotFoundException; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.util.Iterator; - -/** - * - * @author ugnich - */ -public class CleaningUp implements Runnable { - XMPPComponent xmpp; - - public CleaningUp(XMPPComponent xmpp) { - this.xmpp = xmpp; - } - - @Override - public void run() { - while (true) { - try { - PrintWriter statsFile = new PrintWriter(xmpp.STATSFILE, "UTF-8"); - statsFile.write("

Threads: " + Thread.activeCount() + "

"); - statsFile.write("

Out (" + xmpp.getOutConnections().size() + ")

"); - - long now = System.currentTimeMillis(); - - synchronized (xmpp.getOutConnections()) { - for (Iterator i = xmpp.getOutConnections().iterator(); i.hasNext();) { - ConnectionOut c = i.next(); - int inactive = (int) ((double) (now - c.tsLocalData) / 1000.0); - if (inactive > 900) { - c.closeConnection(); - i.remove(); - } else { - statsFile.write(" "); - statsFile.write(" \n"); - statsFile.write(" \n"); - statsFile.write(" \n"); - statsFile.write(" \n"); - statsFile.write(" \n"); - statsFile.write(" "); - } - } - } - - statsFile.write("
tosidinactiveout packetsout bytes
" + c.to + "" + c.streamID + "" + inactive + "" + c.packetsLocal + "" + c.bytesLocal + "

In (" + xmpp.getInConnections().size() + ")

"); - - synchronized (xmpp.getInConnections()) { - for (Iterator i = xmpp.getInConnections().iterator(); i.hasNext();) { - ConnectionIn c = i.next(); - int inactive = (int) ((double) (now - c.tsRemoteData) / 1000.0); - if (inactive > 900) { - c.closeConnection(); - i.remove(); - } else { - statsFile.write(" "); - if (c.from.isEmpty()) { - statsFile.write(" \n"); - } else if (c.from.size() == 1) { - statsFile.write(" \n"); - } else { - String out = " \n"); - } - statsFile.write(" \n"); - statsFile.write(" \n"); - statsFile.write(" \n"); - statsFile.write(" "); - } - } - } - - statsFile.write("
fromsidinactivein packets
 " + c.from.get(0) + ""; - for (int n = 0; n < c.from.size(); n++) { - if (n > 0) { - out += "
"; - } - out += c.from.get(n); - } - statsFile.write(out + "		" + c.streamID + "" + inactive + "" + c.packetsRemote + "

Cache (" + xmpp.getOutCache().size() + ")

"); - - synchronized (xmpp.getOutCache()) { - for (Iterator i = xmpp.getOutCache().iterator(); i.hasNext();) { - CacheEntry c = i.next(); - int inactive = (int) ((double) (now - c.tsCreated) / 1000.0); - if (inactive > 600) { - i.remove(); - } else { - statsFile.write(""); - } - } - } - - statsFile.write("
hostlivesize
" + c.hostname + "" + inactive + "" + c.xml.length() + "
"); - statsFile.close(); - - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - } - } catch (FileNotFoundException e) { - } catch (UnsupportedEncodingException e) { - } - } - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java b/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java deleted file mode 100644 index 83cc18ac..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.juick.ws.s2s; - -import com.juick.ws.components.XMPPComponent; -import org.xmlpull.mxp1.MXParser; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.io.*; -import java.net.Socket; -import java.nio.charset.Charset; -import java.security.*; -import java.security.cert.CertificateException; -import java.util.UUID; -import java.util.logging.Logger; - -/** - * - * @author ugnich - */ -public class Connection { - - protected static final Logger logger = Logger.getLogger(Connection.class.getName()); - - public String streamID; - public long tsCreated = 0; - public long tsLocalData = 0; - public long bytesLocal = 0; - public long packetsLocal = 0; - XMPPComponent xmpp; - Socket socket; - public static final String NS_DB = "jabber:server:dialback"; - public static final String NS_TLS = "urn:ietf:params:xml:ns:xmpp-tls"; - public static final String NS_STREAM = "http://etherx.jabber.org/streams"; - XmlPullParser parser = new MXParser(); - OutputStreamWriter writer; - private boolean secured = false; - SSLContext sc; - private TrustManager[] trustAllCerts = new TrustManager[]{ - new X509TrustManager() { - public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) { - } - - public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) { - } - public java.security.cert.X509Certificate[] getAcceptedIssuers() { - return null; - } - } - }; - - - public Connection(XMPPComponent xmpp) throws XmlPullParserException, KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException, UnrecoverableKeyException, KeyManagementException { - this.xmpp = xmpp; - tsCreated = System.currentTimeMillis(); - parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); - KeyStore ks = KeyStore.getInstance("JKS"); - try (InputStream ksIs = new FileInputStream(xmpp.keystore)) { - ks.load(ksIs, xmpp.keystorePassword.toCharArray()); - KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory - .getDefaultAlgorithm()); - kmf.init(ks, xmpp.keystorePassword.toCharArray()); - sc = SSLContext.getInstance("TLSv1.2"); - sc.init(kmf.getKeyManagers(), trustAllCerts, new SecureRandom()); - } catch (Exception e) { - logger.warning("tls unavailable"); - } - } - - public void logParser() { - if (streamID == null) { - return; - } - String tag = "IN: <" + parser.getName(); - for (int i = 0; i < parser.getAttributeCount(); i++) { - tag += " " + parser.getAttributeName(i) + "=\"" + parser.getAttributeValue(i) + "\""; - } - tag += ">...\n"; - logger.fine(tag); - } - - public void sendStanza(String xml) throws IOException { - if (streamID != null) { - logger.fine("OUT: " + xml + "\n"); - } - writer.write(xml); - writer.flush(); - tsLocalData = System.currentTimeMillis(); - bytesLocal += xml.length(); - packetsLocal++; - } - - public void closeConnection() { - if (streamID != null) { - logger.info(String.format("CLOSING STREAM %s", streamID)); - } - - try { - writer.write(""); - } catch (Exception e) { - } - - try { - writer.close(); - } catch (Exception e) { - } - - try { - socket.close(); - } catch (Exception e) { - } - } - - static String generateDialbackKey(String to, String from, String id) throws Exception { - Mac hmacSha256 = Mac.getInstance("hmacSHA256"); - - SecretKeySpec secret_key = new SecretKeySpec("$UppPerSeCCret4".getBytes(), "SHA-256"); - hmacSha256.init(secret_key); - byte key[] = hmacSha256.doFinal((to + " " + from + " " + id).getBytes()); - - StringBuilder hexkey = new StringBuilder(); - for (int i = 0; i < key.length; i++) { - hexkey.append(Integer.toHexString(0xFF & key[i])); - } - - return hexkey.toString(); - } - - public boolean isSecured() { - return secured; - } - - public void setSecured(boolean secured) { - this.secured = secured; - } - - public void restartParser() throws XmlPullParserException, IOException { - parser = new MXParser(); - parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); - parser.setInput(new InputStreamReader(socket.getInputStream())); - writer = new OutputStreamWriter(socket.getOutputStream(), Charset.forName("UTF-8")); - streamID = UUID.randomUUID().toString(); - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java deleted file mode 100644 index 5ac21fb6..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.juick.ws.s2s; - -import com.juick.ws.components.XMPPComponent; -import com.juick.xmpp.Iq; -import com.juick.xmpp.JID; -import com.juick.xmpp.Message; -import com.juick.xmpp.Presence; -import com.juick.xmpp.utils.XmlUtils; -import org.xmlpull.v1.XmlPullParser; - -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSocket; -import java.io.EOFException; -import java.io.IOException; -import java.net.Socket; -import java.net.SocketException; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * - * @author ugnich - */ -public class ConnectionIn extends Connection implements Runnable { - - private static final Logger LOGGER = Logger.getLogger(ConnectionIn.class.getName()); - - final public List from = new ArrayList<>(); - public long tsRemoteData = 0; - public long packetsRemote = 0; - JuickBot bot; - - public ConnectionIn(XMPPComponent xmpp, JuickBot bot, Socket socket) throws Exception { - super(xmpp); - this.bot = bot; - this.socket = socket; - streamID = UUID.randomUUID().toString(); - restartParser(); - } - - @Override - public void run() { - LOGGER.info("STREAM FROM ? " + streamID + " START"); - try { - parser.next(); // stream:stream - updateTsRemoteData(); - if (!parser.getName().equals("stream") - || !parser.getNamespace("stream").equals(NS_STREAM)) { -// || !parser.getAttributeValue(null, "version").equals("1.0") -// || !parser.getAttributeValue(null, "to").equals(Main.HOSTNAME)) { - throw new Exception("STREAM FROM ? " + streamID + " INVALID FIRST PACKET"); - } - boolean xmppversionnew = parser.getAttributeValue(null, "version") != null; - String from = parser.getAttributeValue(null, "from"); - - if (xmpp.bannedHosts.contains(from)) { - closeConnection(); - return; - } - sendOpenStream(from, xmppversionnew); - - while (parser.next() != XmlPullParser.END_DOCUMENT) { - updateTsRemoteData(); - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - logParser(); - - packetsRemote++; - - String tag = parser.getName(); - if (tag.equals("result") && parser.getNamespace().equals(NS_DB)) { - String dfrom = parser.getAttributeValue(null, "from"); - String to = parser.getAttributeValue(null, "to"); - LOGGER.info("STREAM FROM " + dfrom + " TO " + to + " " + streamID + " ASKING FOR DIALBACK"); - if (dfrom.endsWith(xmpp.HOSTNAME) && (dfrom.equals(xmpp.HOSTNAME) || dfrom.endsWith("." + xmpp.HOSTNAME))) { - break; - } - if (to != null && to.equals(xmpp.HOSTNAME)) { - String dbKey = XmlUtils.getTagText(parser); - updateTsRemoteData(); - - ConnectionOut c = xmpp.getConnectionOut(dfrom, false); - if (c != null) { - c.sendDialbackVerify(streamID, dbKey); - } else { - c = new ConnectionOut(xmpp, dfrom, streamID, dbKey); - xmpp.service.submit(c); - } - } else { - throw new HostUnknownException("STREAM FROM " + dfrom + " " + streamID + " INVALID TO " + to); - } - } else if (tag.equals("verify") && parser.getNamespace().equals(NS_DB)) { - String vfrom = parser.getAttributeValue(null, "from"); - String vto = parser.getAttributeValue(null, "to"); - String vid = parser.getAttributeValue(null, "id"); - String vkey = XmlUtils.getTagText(parser); - updateTsRemoteData(); - boolean valid = false; - if (vfrom != null && vto != null && vid != null && vkey != null) { - String vkey2 = generateDialbackKey(vfrom, vto, vid); - valid = vkey.equals(vkey2); - } - if (valid) { - sendStanza(""); - LOGGER.info("STREAM FROM " + vfrom + " " + streamID + " DIALBACK VERIFY VALID"); - } else { - sendStanza(""); - LOGGER.warning("STREAM FROM " + vfrom + " " + streamID + " DIALBACK VERIFY INVALID"); - } - } else if (tag.equals("presence") && checkFromTo(parser)) { - Presence p = Presence.parse(parser, null); - if (p != null && (p.type == null || !p.type.equals(Presence.Type.error))) { - bot.incomingPresence(p); - } - } else if (tag.equals("message") && checkFromTo(parser)) { - updateTsRemoteData(); - Message msg = Message.parse(parser, xmpp.childParsers); - if (msg != null && (msg.type == null || !msg.type.equals(Message.Type.error))) { - LOGGER.info("STREAM " + streamID + ": " + msg.toString()); - if (!bot.incomingMessage(msg)) { - xmpp.getRouter().send(msg.toString()); - } - } - } else if (tag.equals("iq") && checkFromTo(parser)) { - updateTsRemoteData(); - String type = parser.getAttributeValue(null, "type"); - String xml = XmlUtils.parseToString(parser, true); - if (type == null || !type.equals(Iq.Type.error)) { - LOGGER.info("STREAM " + streamID + ": " + xml); - xmpp.getRouter().send(xml); - } - } else if (sc != null && !isSecured() && tag.equals("starttls")) { - LOGGER.info("STREAM " + streamID + " SECURING"); - sendStanza(""); - try { - socket = sc.getSocketFactory().createSocket(socket, socket.getInetAddress().getHostAddress(), - socket.getPort(), true); - ((SSLSocket) socket).setUseClientMode(false); - ((SSLSocket) socket).startHandshake(); - setSecured(true); - LOGGER.info("STREAM " + streamID + " SECURED"); - restartParser(); - } catch (SSLException sex) { - LOGGER.warning("STREAM " + streamID + " SSL ERROR"); - sendStanza(""); - xmpp.removeConnectionIn(this); - closeConnection(); - } - } else if (isSecured() && tag.equals("stream") && parser.getNamespace().equals(NS_STREAM)) { - sendOpenStream(null, true); - } else { - LOGGER.info("STREAM " + streamID + ": " + XmlUtils.parseToString(parser, true)); - } - } - LOGGER.warning("STREAM " + streamID + " FINISHED"); - xmpp.removeConnectionIn(this); - closeConnection(); - } catch (EOFException | SocketException ex) { - LOGGER.info(String.format("STREAM %s CLOSED (dirty)", streamID)); - xmpp.removeConnectionIn(this); - closeConnection(); - } catch (HostUnknownException e) { - LOGGER.warning(e.getMessage()); - } catch (Exception e) { - LOGGER.log(Level.WARNING, "STREAM " + streamID + " ERROR", e); - xmpp.removeConnectionIn(this); - closeConnection(); - } - } - - void updateTsRemoteData() { - tsRemoteData = System.currentTimeMillis(); - } - - void sendOpenStream(String from, boolean xmppversionnew) throws IOException { - String openStream = ""; - if (xmppversionnew) { - openStream += ""; - if (sc != null && !isSecured() && !xmpp.brokenSSLhosts.contains(from)) { - openStream += ""; - } - openStream += ""; - } - sendStanza(openStream); - } - - public void sendDialbackResult(String sfrom, String type) { - try { - sendStanza(""); - if (type.equals("valid")) { - from.add(sfrom); - LOGGER.info("STREAM FROM " + sfrom + " " + streamID + " READY"); - } - } catch (IOException e) { - LOGGER.warning("STREAM FROM " + sfrom + " " + streamID + " ERROR: " + e.toString()); - } - } - - boolean checkFromTo(XmlPullParser parser) throws Exception { - String cfrom = parser.getAttributeValue(null, "from"); - String cto = parser.getAttributeValue(null, "to"); - if (cfrom != null && cto != null && !cfrom.isEmpty() && !cto.isEmpty()) { - JID jidto = new JID(cto); - if (jidto.Host != null && jidto.Username != null && jidto.Host.equals(xmpp.HOSTNAME) && jidto.Username.matches("^[a-zA-Z0-9\\-]{2,16}$")) { - JID jidfrom = new JID(cfrom); - int size = from.size(); - for (int i = 0; i < size; i++) { - if (from.get(i).equals(jidfrom.Host)) { - return true; - } - } - } - } - return false; - } - class HostUnknownException extends Exception { - public HostUnknownException(String message) { - super(message); - } - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionOut.java b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionOut.java deleted file mode 100644 index 6a0fe33b..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionOut.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.juick.ws.s2s; - -import com.juick.ws.components.XMPPComponent; -import com.juick.xmpp.extensions.StreamFeatures; -import com.juick.xmpp.utils.XmlUtils; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSocket; -import java.io.EOFException; -import java.io.IOException; -import java.net.Socket; -import java.net.SocketException; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; -import java.util.UUID; -import java.util.logging.Level; - -/** - * @author ugnich - */ -public class ConnectionOut extends Connection implements Runnable { - - public boolean streamReady = false; - public String to; - String checkSID = null; - String dbKey = null; - - public ConnectionOut(XMPPComponent xmpp, String hostname) throws CertificateException, UnrecoverableKeyException, NoSuchAlgorithmException, XmlPullParserException, KeyManagementException, KeyStoreException, IOException { - super(xmpp); - to = hostname; - } - - public ConnectionOut(XMPPComponent xmpp, String hostname, String checkSID, String dbKey) throws Exception { - super(xmpp); - to = hostname; - this.checkSID = checkSID; - this.dbKey = dbKey; - streamID = UUID.randomUUID().toString(); - } - - void sendOpenStream() throws IOException { - sendStanza(""); - } - - void processDialback() throws Exception { - if (checkSID != null) { - sendDialbackVerify(checkSID, dbKey); - } - sendStanza("" + - generateDialbackKey(to, xmpp.HOSTNAME, streamID) + ""); - } - - @Override - public void run() { - logger.info("STREAM TO " + to + " START"); - try { - socket = new Socket(); - socket.connect(DNSQueries.getServerAddress(to)); - restartParser(); - - sendOpenStream(); - - parser.next(); // stream:stream - streamID = parser.getAttributeValue(null, "id"); - if (streamID == null || streamID.isEmpty()) { - throw new Exception("STREAM TO " + to + " INVALID FIRST PACKET"); - } - - logger.info("STREAM TO " + to + " " + streamID + " OPEN"); - xmpp.addConnectionOut(ConnectionOut.this); - boolean xmppversionnew = parser.getAttributeValue(null, "version") != null; - if (!xmppversionnew) { - processDialback(); - } - - while (parser.next() != XmlPullParser.END_DOCUMENT) { - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - logParser(); - - String tag = parser.getName(); - if (tag.equals("result") && parser.getNamespace().equals(NS_DB)) { - String type = parser.getAttributeValue(null, "type"); - if (type != null && type.equals("valid")) { - streamReady = true; - logger.info("STREAM TO " + to + " " + streamID + " READY"); - - String cache = xmpp.getFromCache(to); - if (cache != null) { - logger.info("STREAM TO " + to + " " + streamID + " SENDING CACHE"); - sendStanza(cache); - } - - } else { - logger.info("STREAM TO " + to + " " + streamID + " DIALBACK FAIL"); - } - XmlUtils.skip(parser); - } else if (tag.equals("verify") && parser.getNamespace().equals(NS_DB)) { - String from = parser.getAttributeValue(null, "from"); - String type = parser.getAttributeValue(null, "type"); - String sid = parser.getAttributeValue(null, "id"); - if (from != null && from.equals(to) && sid != null && !sid.isEmpty() && type != null) { - ConnectionIn c = xmpp.getConnectionIn(sid); - if (c != null) { - c.sendDialbackResult(from, type); - } - } - XmlUtils.skip(parser); - } else if (tag.equals("features") && parser.getNamespace().equals(NS_STREAM)) { - StreamFeatures features = StreamFeatures.parse(parser); - if (sc != null && !isSecured() && features.STARTTLS >= 0 && !xmpp.brokenSSLhosts.contains(to)) { - logger.info("STREAM TO " + to + " " + streamID + " SECURING"); - sendStanza(""); - } else { - processDialback(); - } - } else if (tag.equals("proceed") && parser.getNamespace().equals(NS_TLS)) { - try { - socket = sc.getSocketFactory().createSocket(socket, socket.getInetAddress().getHostAddress(), - socket.getPort(), true); - ((SSLSocket) socket).startHandshake(); - setSecured(true); - logger.info("STREAM " + streamID + " SECURED"); - restartParser(); - sendOpenStream(); - } catch (SSLException sex) { - logger.log(Level.SEVERE, String.format("s2s ssl error: %s %s", to, streamID), sex); - sendStanza(""); - xmpp.removeConnectionOut(this); - closeConnection(); - } - } else if (isSecured() && tag.equals("stream") && parser.getNamespace().equals(NS_STREAM)) { - streamID = parser.getAttributeValue(null, "id"); - } else { - logger.info("STREAM TO " + to + " " + streamID + ": " + XmlUtils.parseToString(parser, true)); - } - } - - logger.warning("STREAM TO " + to + " " + streamID + " FINISHED"); - xmpp.removeConnectionOut(ConnectionOut.this); - closeConnection(); - } catch (EOFException | SocketException eofex) { - logger.info(String.format("STREAM %s %s CLOSED (dirty)", to, streamID)); - xmpp.removeConnectionOut(ConnectionOut.this); - closeConnection(); - } catch (Exception e) { - logger.log(Level.SEVERE, String.format("s2s out exception: %s %s", to, streamID), e); - xmpp.removeConnectionOut(ConnectionOut.this); - closeConnection(); - } - } - - public void sendDialbackVerify(String sid, String key) { - try { - sendStanza("" + key + ""); - } catch (IOException e) { - logger.log(Level.WARNING, "STREAM TO " + to + " " + streamID + " ERROR", e); - } - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/DNSQueries.java b/juick-ws/src/main/java/com/juick/ws/s2s/DNSQueries.java deleted file mode 100644 index 35e72c2b..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/DNSQueries.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.juick.ws.s2s; - -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.util.Hashtable; -import java.util.Random; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; - -/** - * - * @author ugnich - */ -public class DNSQueries { - - private static Random rand = new Random(); - - public static InetSocketAddress getServerAddress(String hostname) throws UnknownHostException { - - String host = hostname; - int port = 5269; - - try { - Hashtable env = new Hashtable(5); - env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory"); - DirContext ctx = new InitialDirContext(env); - Attribute att = ctx.getAttributes("_xmpp-server._tcp." + hostname, new String[]{"SRV"}).get("SRV"); - - if (att != null && att.size() > 0) { - int i = rand.nextInt(att.size()); - try { - String srv[] = att.get(i).toString().split(" "); - port = Integer.parseInt(srv[2]); - host = srv[3]; - } catch (Exception e) { - } - } - - ctx.close(); - } catch (NamingException e) { - } - - return new InetSocketAddress(host, port); - } -} diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/JuickBot.java b/juick-ws/src/main/java/com/juick/ws/s2s/JuickBot.java deleted file mode 100644 index 659b7ecd..00000000 --- a/juick-ws/src/main/java/com/juick/ws/s2s/JuickBot.java +++ /dev/null @@ -1,379 +0,0 @@ -package com.juick.ws.s2s; - -import com.juick.User; -import com.juick.ws.components.XMPPComponent; -import com.juick.server.PMQueries; -import com.juick.server.TagQueries; -import com.juick.server.UserQueries; -import com.juick.xmpp.JID; -import com.juick.xmpp.Message; -import com.juick.xmpp.Presence; -import com.juick.xmpp.extensions.Error; -import com.juick.xmpp.extensions.JuickMessage; - -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * - * @author ugnich - */ -public class JuickBot { - XMPPComponent xmpp; - public JuickBot(XMPPComponent xmpp, JID JuickJID) { - this.xmpp = xmpp; - this.JuickJID = JuickJID; - } - - public final JID JuickJID; - private static final String HELPTEXT = - "@username text - Send private message\n" - + "*tagname Blah-blah-blah - Post a message with tag 'tagname'\n" - + "#1234 Blah-blah-blah - Answer to message #1234\n" - + "#1234/5 Blah - Answer to reply #1234/5\n" - + "! #1234 - Recommend post\n" - + "\n" - + "# - Show last messages from your feed (## - second page, ...)\n" - + "@ - Show recomendations and popular personal blogs\n" - + "* - Show your tags\n" - + "#1234 - Show message\n" - + "#1234+ - Show message with replies\n" - + "@username - Show user's info\n" - + "@username+ - Show user's info and last 10 messages\n" - + "@username *tag - User's messages with this tag\n" - + "*tag - Show last 10 messages with this tag\n" - + "? blah - Search posts for 'blah'\n" - + "? @username blah - Searching among user\'s posts for 'blah'\n" - + "D #123 - Delete message\n" - + "D #123/45 - Delete reply\n" - + "DL - Delete last message/reply\n" - + "S - Show your subscriptions\n" - + "S #123 - Subscribe to message replies\n" - + "S @username - Subscribe to user's blog\n" - + "U #123 - Unsubscribe from comments\n" - + "U @username - Unsubscribe from user's blog\n" - + "BL - Show your blacklist\n" - + "BL @username - Add/delete user to/from your blacklist\n" - + "BL *tag - Add/delete tag to/from your blacklist\n" - + "ON / OFF - Enable/disable subscriptions delivery\n" - + "PING - Pong\n" - + "\n" - + "Read more: http://juick.com/help/"; - - public boolean incomingPresence(Presence p) throws Exception { - final String username = p.to.Username.toLowerCase(); - final boolean toJuick = username.equals("juick"); - - if (p.type == null) { - Presence reply = new Presence(); - reply.from = new JID(p.to.Username, p.to.Host, null); - reply.to = new JID(p.from.Username, p.from.Host, null); - reply.type = Presence.Type.unsubscribe; - xmpp.sendOut(reply); - return true; - } else if (p.type.equals(Presence.Type.probe)) { - int uid_to = 0; - if (!toJuick) { - uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); - } - - if (toJuick || uid_to > 0) { - Presence reply = new Presence(); - reply.from = p.to; - reply.from.Resource = "Juick"; - reply.to = p.from; - reply.priority = 10; - xmpp.sendOut(reply); - } else { - Presence reply = new Presence(p.to, p.from, Presence.Type.error); - reply.id = p.id; - reply.addChild(new Error(Error.Type.cancel, "item-not-found")); - xmpp.sendOut(reply); - return true; - } - return true; - } else if (p.type.equals(Presence.Type.subscribe)) { - boolean canSubscribe = false; - if (toJuick) { - canSubscribe = true; - } else { - int uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); - if (uid_to > 0) { - PMQueries.addPMinRoster(xmpp.jdbc, uid_to, p.from.Bare()); - canSubscribe = true; - } - } - - if (canSubscribe) { - Presence reply = new Presence(p.to, p.from, Presence.Type.subscribed); - xmpp.sendOut(reply); - - reply.from.Resource = "Juick"; - reply.priority = 10; - reply.type = null; - xmpp.sendOut(reply); - - return true; - } else { - Presence reply = new Presence(p.to, p.from, Presence.Type.error); - reply.id = p.id; - reply.addChild(new Error(Error.Type.cancel, "item-not-found")); - xmpp.sendOut(reply); - return true; - } - } else if (p.type.equals(Presence.Type.unsubscribe)) { - if (!toJuick) { - int uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); - if (uid_to > 0) { - PMQueries.removePMinRoster(xmpp.jdbc, uid_to, p.from.Bare()); - } - } - - Presence reply = new Presence(p.to, p.from, Presence.Type.unsubscribed); - xmpp.sendOut(reply); - } - - return false; - } - - public boolean incomingMessage(Message msg) throws Exception { - if (msg.body == null || msg.body.isEmpty()) { - return true; - } - - String username = msg.to.Username.toLowerCase(); - - User user_from = null; - String signuphash = ""; - user_from = UserQueries.getUserByJID(xmpp.jdbc, msg.from.Bare()); - if (user_from == null) { - signuphash = UserQueries.getSignUpHashByJID(xmpp.jdbc, msg.from.Bare()); - } - - if (user_from == null) { - Message reply = new Message(msg.to, msg.from, Message.Type.chat); - if (username.equals("juick")) { - reply.body = "Для того, чтобы начать пользоваться сервисом, пожалуйста пройдите быструю регистрацию: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nTo start using Juick, please sign up: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nIf you already have an account on Juick, you will be proposed to attach this JabberID to your existing account."; - } else { - reply.body = "Внимание, системное сообщение!\nВаш JabberID не обнаружен в списке доверенных. Для того, чтобы отправить сообщение пользователю " + username + "@juick.com, пожалуйста зарегистрируйте свой JabberID в системе: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nWarning, system message!\nYour JabberID is not found in our server's white list. To send a message to " + username + "@juick.com, please sign up: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nIf you already have an account on Juick, you will be proposed to attach this JabberID to your existing account."; - } - xmpp.sendOut(reply); - return true; - } - - if (username.equals("juick")) { - return incomingMessageJuick(user_from, msg); - } - - int uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); - - if (uid_to == 0) { - Message reply = new Message(msg.to, msg.from, Message.Type.error); - reply.id = msg.id; - reply.addChild(new Error(Error.Type.cancel, "item-not-found")); - xmpp.sendOut(reply); - return true; - } - - boolean success = false; - if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUID())) { - success = PMQueries.createPM(xmpp.jdbc, user_from.getUID(), uid_to, msg.body); - } - - if (success) { - Message m = new Message(); - m.from = new JID("juick", "juick.com", null); - m.to = new JID(Integer.toString(uid_to), "push.juick.com", null); - JuickMessage jmsg = new JuickMessage(); - jmsg.setUser(user_from); - jmsg.setText(msg.body); - m.childs.add(jmsg); - xmpp.getRouter().send(m.toString()); - - m.to.Host = "ws.juick.com"; - xmpp.getRouter().send(m.toString()); - - List jids; - boolean inroster = false; - jids = UserQueries.getJIDsbyUID(xmpp.jdbc, uid_to); - for (String jid : jids) { - Message mm = new Message(); - mm.to = new JID(jid); - mm.type = Message.Type.chat; - inroster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUID(), jid); - if (inroster) { - mm.from = new JID(jmsg.getUser().getUName(), "juick.com", "Juick"); - mm.body = msg.body; - } else { - mm.from = new JID("juick", "juick.com", "Juick"); - mm.body = "Private message from @" + jmsg.getUser().getUName() + ":\n" + msg.body; - } - xmpp.sendOut(mm); - } - } else { - Message reply = new Message(msg.to, msg.from, Message.Type.error); - reply.id = msg.id; - reply.addChild(new Error(Error.Type.cancel, "not-allowed")); - xmpp.sendOut(reply); - } - - return false; - } - private static Pattern regexPM = Pattern.compile("^\\@(\\S+)\\s+([\\s\\S]+)$"); - - public boolean incomingMessageJuick(User user_from, Message msg) throws Exception { - String command = msg.body.trim(); - int commandlen = command.length(); - - // COMPATIBILITY - if (commandlen > 7 && command.substring(0, 3).equalsIgnoreCase("PM ")) { - command = command.substring(3).trim(); - commandlen = command.length(); - } - - if (commandlen == 4) { - if (command.equalsIgnoreCase("PING")) { - commandPing(msg); - return true; - } else if (command.equalsIgnoreCase("HELP")) { - commandHelp(msg); - return true; - } - } else if (commandlen == 5 && command.equalsIgnoreCase("LOGIN")) { - commandLogin(msg, user_from); - return true; - } else if (command.charAt(0) == '@') { - Matcher matchPM = regexPM.matcher(command); - if (matchPM.find()) { - String user_to = matchPM.group(1); - String msgtxt = matchPM.group(2); - commandPM(msg, user_from, user_to, msgtxt); - return true; - } - } else if (commandlen == 2 && command.equalsIgnoreCase("BL")) { - commandBLShow(msg, user_from); - return true; - } - - return false; - } - - private void commandPing(Message m) throws Exception { - Presence p = new Presence(JuickJID, m.from); - p.priority = 10; - xmpp.sendOut(p); - - Message reply = new Message(JuickJID, m.from, Message.Type.chat); - reply.body = "PONG"; - xmpp.sendOut(reply); - } - - private void commandHelp(Message m) throws Exception { - Message reply = new Message(JuickJID, m.from, Message.Type.chat); - reply.body = HELPTEXT; - xmpp.sendOut(reply); - } - - private void commandLogin(Message m, User user_from) throws Exception { - Message reply = new Message(JuickJID, m.from, Message.Type.chat); - reply.body = "http://juick.com/login?" + UserQueries.getHashByUID(xmpp.jdbc, user_from.getUID()); - xmpp.sendOut(reply); - } - - private void commandPM(Message m, User user_from, String user_to, String body) throws Exception { - int ret = 0; - - int uid_to = 0; - List jids_to = null; - boolean haveInRoster = false; - - if (user_to.indexOf('@') > 0) { - uid_to = UserQueries.getUIDbyJID(xmpp.jdbc, user_to); - } else { - uid_to = UserQueries.getUIDbyName(xmpp.jdbc, user_to); - } - - if (uid_to > 0) { - if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUID())) { - if (PMQueries.createPM(xmpp.jdbc, user_from.getUID(), uid_to, body)) { - jids_to = UserQueries.getJIDsbyUID(xmpp.jdbc, uid_to); - ret = 200; - } else { - ret = 500; - } - } else { - ret = 403; - } - } else { - ret = 404; - } - - if (ret == 200) { - Message msg = new Message(); - msg.from = new JID("juick", "juick.com", null); - msg.to = new JID(Integer.toString(uid_to), "push.juick.com", null); - JuickMessage jmsg = new JuickMessage(); - jmsg.setUser(user_from); - jmsg.setText(body); - msg.childs.add(jmsg); - xmpp.getRouter().send(msg.toString()); - - msg.to.Host = "ws.juick.com"; - xmpp.getRouter().send(msg.toString()); - - for (String jid : jids_to) { - Message mm = new Message(); - mm.to = new JID(jid); - mm.type = Message.Type.chat; - haveInRoster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUID(), jid); - if (haveInRoster) { - mm.from = new JID(user_from.getUName(), "juick.com", "Juick"); - mm.body = body; - } else { - mm.from = new JID("juick", "juick.com", "Juick"); - mm.body = "Private message from @" + user_from.getUName() + ":\n" + body; - } - xmpp.sendOut(mm); - } - } - - Message reply = new Message(m.to, m.from); - if (ret == 200) { - reply.type = m.type; - reply.body = "Private message sent"; - } else { - reply.type = Message.Type.error; - reply.body = "Error " + ret; - } - xmpp.sendOut(reply); - } - - private void commandBLShow(Message m, User user_from) throws Exception { - List blusers = UserQueries.getUserBLUsers(xmpp.jdbc, user_from.getUID()); - List bltags = TagQueries.getUserBLTags(xmpp.jdbc, user_from.getUID()); - - String txt = ""; - if (bltags.size() > 0) { - for (String bltag : bltags) { - txt += "*" + bltag + "\n"; - } - - if (blusers.size() > 0) { - txt += "\n"; - } - } - if (blusers.size() > 0) { - for (User bluser : blusers) { - txt += "@" + bluser.getUName() + "\n"; - } - } - if (txt.isEmpty()) { - txt = "You don't have any users or tags in your blacklist."; - } - - Message reply = new Message(JuickJID, m.from, Message.Type.chat); - reply.body = txt; - xmpp.sendOut(reply); - } -} -- cgit v1.2.3