Lithium 2.1.1

Cryptonite 1.1-snapshot

Author: dkovacevic

.travis.yml

@@ -7,9 +7,12 @@ cache:
 services:
 - docker
 after_success:
-- if [[ "$TRAVIS_BRANCH" == "master" ]]; then docker login -u $DOCKER_USERNAME -p
- $DOCKER_PASSWORD ; docker build -t dejankovacevic/github-bot:latest
- . ; docker push dejankovacevic/github-bot ; fi
+- if [[ "$TRAVIS_BRANCH" == "master" ]]; then
+ docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ;
+ docker build -t dejankovacevic/github-bot:latest . ;
+ docker push dejankovacevic/github-bot ;
+fi
+
 before_install:
 - openssl aes-256-cbc -K $encrypted_941c9d24308c_key -iv $encrypted_941c9d24308c_iv
  -in client-secret.json.enc -out client-secret.json -d

Dockerfile

@@ -1,7 +1,7 @@
 FROM dejankovacevic/bots.runtime:latest
 
 COPY target/github.jar /opt/github/github.jar
-COPY conf/github.yaml /etc/github/github.yaml
+COPY github.yaml  /etc/github/github.yaml
 
 WORKDIR /opt/github
 

conf/github.yaml github.yamlconf/github.yaml renamed to github.yaml

@@ -7,4 +7,4 @@ server:
  appenders: []
 
 auth: "your_token"
-cryptoDir: /var/lib/github/crypto
+data: ./data

pom.xml

@@ -6,7 +6,7 @@
 
  <artifactId>github-bot</artifactId>
  <groupId>com.wire.bots</groupId>
- <version>0.2.0</version>
+ <version>0.3.0</version>
 
  <repositories>
  <repository>
@@ -16,6 +16,13 @@
  <enabled>true</enabled>
  </releases>
  </repository>
+ <repository>
+ <id>cryptonite</id>
+ <url>https://packagecloud.io/dkovacevic/cryptonite/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
  </repositories>
 
  <profiles>
@@ -62,7 +69,12 @@
  <dependency>
  <groupId>com.wire.bots</groupId>
  <artifactId>lithium</artifactId>
- <version>1.1.3</version>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wire.bots</groupId>
+ <artifactId>cryptonite</artifactId>
+ <version>1.1-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>com.github.spullara.mustache.java</groupId>

src/main/java/com/wire/bots/github/BotService.java

@@ -18,9 +18,15 @@
 
 package com.wire.bots.github;
 
+import com.wire.bots.cryptonite.CryptoService;
+import com.wire.bots.cryptonite.StorageService;
+import com.wire.bots.cryptonite.client.CryptoClient;
+import com.wire.bots.cryptonite.client.StorageClient;
 import com.wire.bots.github.resource.GitHubResource;
 import com.wire.bots.sdk.MessageHandlerBase;
 import com.wire.bots.sdk.Server;
+import com.wire.bots.sdk.factories.CryptoFactory;
+import com.wire.bots.sdk.factories.StorageFactory;
 import io.dropwizard.setup.Environment;
 
 public class BotService extends Server<BotConfig> {
@@ -30,12 +36,22 @@ public static void main(String[] args) throws Exception {
 
  @Override
  protected MessageHandlerBase createHandler(BotConfig config, Environment env) {
- return new MessageHandler(config);
+ return new MessageHandler(getStorageFactory(config));
  }
 
  @Override
  protected void onRun(BotConfig botConfig, Environment env) {
- Validator validator = new Validator(config.getCryptoDir());
+ Validator validator = new Validator(config.data);
  addResource(new GitHubResource(repo, validator), env);
  }
+
+ @Override
+ protected StorageFactory getStorageFactory(BotConfig config) {
+ return botId -> new StorageService("github", botId, new StorageClient(config.data));
+ }
+
+ @Override
+ protected CryptoFactory getCryptoFactory(BotConfig config) {
+ return (botId) -> new CryptoService(botId, new CryptoClient(config.data));
+ }
 }

src/main/java/com/wire/bots/github/MessageHandler.java

@@ -19,29 +19,29 @@
 package com.wire.bots.github;
 
 import com.wire.bots.github.utils.SessionIdentifierGenerator;
-import com.wire.bots.sdk.Logger;
 import com.wire.bots.sdk.MessageHandlerBase;
-import com.wire.bots.sdk.Util;
 import com.wire.bots.sdk.WireClient;
+import com.wire.bots.sdk.factories.StorageFactory;
 import com.wire.bots.sdk.models.TextMessage;
 import com.wire.bots.sdk.server.model.Member;
 import com.wire.bots.sdk.server.model.NewBot;
 import com.wire.bots.sdk.server.model.User;
+import com.wire.bots.sdk.tools.Logger;
+import com.wire.bots.sdk.tools.Util;
 
 import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 public class MessageHandler extends MessageHandlerBase {
- private final BotConfig config;
+ private static final String SECRET_FILE = "secret";
  private final SessionIdentifierGenerator sesGen = new SessionIdentifierGenerator();
+ private final StorageFactory storageFactory;
 
- MessageHandler(BotConfig config) {
- this.config = config;
+ MessageHandler(StorageFactory storageFactory) {
+ this.storageFactory = storageFactory;
  }
 
  @Override
@@ -65,7 +65,7 @@ public boolean onNewBot(NewBot newBot) {
  public void onNewConversation(WireClient client) {
  try {
  String secret = sesGen.next(6);
- Util.writeLine(secret, new File(String.format("%s/%s/secret", config.getCryptoDir(), client.getId())));
+ storageFactory.create(client.getId()).saveFile(SECRET_FILE, secret);
 
  String help = formatHelp(client);
  client.sendText(help, TimeUnit.MINUTES.toMillis(15));
@@ -89,21 +89,21 @@ public void onText(WireClient client, TextMessage msg) {
  }
  }
 
- private String formatHelp(WireClient client) throws IOException {
+ private String formatHelp(WireClient client) throws Exception {
  String botId = client.getId();
  String host = getHost();
- String secret = Util.readLine(new File(String.format("%s/%s/secret", config.getCryptoDir(), botId)));
+ String secret = storageFactory.create(botId).readFile(SECRET_FILE);
  String name = client.getConversation().name;
  String convName = name != null ? URLEncoder.encode(name, "UTF-8") : "";
- String owner = getOwner(client, botId);
+ String owner = getOwner(client);
 
  String url = String.format("https://%s/%s#conv=%s,owner=@%s", host, botId, convName, owner);
  return formatHelp(url, secret);
  }
 
  private String formatHelp(String url, String secret) {
  return String.format("Hi, I'm GitHub bot. Here is how to set me up:\n\n"
- + "1. Go to the repository that you want to connect to\n"
+ + "1. Go to the repository that you would like to connect to\n"
  + "2. Go to **Settings / Webhooks / Add webhook**\n"
  + "3. Add **Payload URL**: %s\n"
  + "4. Set **Content-Type**: application/json\n"
@@ -117,12 +117,10 @@ private String getHost() {
  }
 
  @Nullable
- private String getOwner(WireClient client, String botId) throws IOException {
- File originFile = new File(String.format("%s/%s/origin.id", config.getCryptoDir(), botId));
- if (!originFile.exists())
- return null;
- String origin = Util.readLine(originFile);
- Collection<User> users = client.getUsers(Collections.singletonList(origin));
+ private String getOwner(WireClient client) throws Exception {
+ String botId = client.getId();
+ NewBot state = storageFactory.create(botId).getState();
+ Collection<User> users = client.getUsers(Collections.singletonList(state.origin.id));
  for (User user : users)
  return user.handle;
  return null;

src/main/java/com/wire/bots/github/Validator.java

@@ -1,6 +1,6 @@
 package com.wire.bots.github;
 
-import com.wire.bots.sdk.Util;
+import com.wire.bots.sdk.tools.Util;
 
 import java.io.File;
 

src/main/java/com/wire/bots/github/resource/GitHubResource.java

@@ -5,8 +5,8 @@
 import com.wire.bots.github.WebHookHandler;
 import com.wire.bots.github.model.GitResponse;
 import com.wire.bots.sdk.ClientRepo;
-import com.wire.bots.sdk.Logger;
 import com.wire.bots.sdk.WireClient;
+import com.wire.bots.sdk.tools.Logger;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -18,12 +18,12 @@ public class GitHubResource {
 
  private final ClientRepo repo;
  private final Validator validator;
- private final ObjectMapper mapper = new ObjectMapper();
- private final WebHookHandler webHookHandler = new WebHookHandler();
+ private final WebHookHandler webHookHandler;
 
  public GitHubResource(ClientRepo repo, Validator validator) {
  this.repo = repo;
  this.validator = validator;
+ webHookHandler = new WebHookHandler();
  }
 
  @POST
@@ -50,6 +50,7 @@ public Response webHook(
  build();
  }
 
+ ObjectMapper mapper = new ObjectMapper();
  GitResponse response = mapper.readValue(payload, GitResponse.class);
 
  Logger.info("%s.%s\tBot: %s", event, response.action, botId);

src/tests/com/wire/bots/github/test/GitHubResourceTest.java

@@ -1,11 +1,12 @@
 //package com.wire.bots.github.test;
 //
-//import com.wire.bots.github.Validator;
+//import com.wire.bots.github.BotConfig;
+//import com.wire.bots.github.BotService;
 //import com.wire.bots.github.resource.GitHubResource;
 //import com.wire.bots.github.test.helpers.DummyRepo;
 //import com.wire.bots.github.test.helpers.DummyValidator;
-//import com.wire.bots.sdk.ClientRepo;
 //import io.dropwizard.testing.FixtureHelpers;
+//import io.dropwizard.testing.junit.DropwizardAppRule;
 //import io.dropwizard.testing.junit.ResourceTestRule;
 //import org.junit.ClassRule;
 //import org.junit.Test;
@@ -17,30 +18,32 @@
 //import static junit.framework.TestCase.assertEquals;
 //
 //public class GitHubResourceTest {
-// private static Validator validator = new DummyValidator();
-// private static ClientRepo repo = new DummyRepo();
+// @ClassRule
+// public static final DropwizardAppRule<BotConfig> app
+// = new DropwizardAppRule<>(BotService.class, "github.yaml");
 //
 // @ClassRule
 // public static final ResourceTestRule resources = ResourceTestRule.builder()
-// .addResource(new GitHubResource(repo, validator))
+// .addResource(new GitHubResource(new DummyRepo(), new DummyValidator()))
 // .build();
 //
 // @Test
 // public void testOnCommitCommentCreated() {
 // String event = "commit_comment";
 // String payload = FixtureHelpers.fixture("fixtures/events/" + event + ".created.json");
-// gitHubWebhookPost(event, payload);
+// gitHubWebhookPost("bot", event, payload);
 // }
 //
 // @Test
 // public void testOnPRCreated() {
 // String event = "pull_request";
 // String payload = FixtureHelpers.fixture("fixtures/events/" + event + ".created.json");
-// gitHubWebhookPost(event, payload);
+// gitHubWebhookPost("bot", event, payload);
 // }
 //
-// private void gitHubWebhookPost(String event, String payload) {
-// Response response = resources.target("/github/botId")
+// private void gitHubWebhookPost(String botId, String event, String payload) {
+// Response response = resources.target("/")
+// .path(botId)
 // .request()
 // .header("X-GitHub-Event", event)
 // .header("X-Hub-Signature", "signature")