Skip to content

Updated gaibu with token decryption in tokenStore #102

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
jnorgan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated gaibu with token decryption in tokenStore #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0a40c
Updated gaibu with token decryption in tokenStore
Dec 5, 2016
399b801
Gaibu version update
Dec 5, 2016
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<metrics.version>3.1.2</metrics.version>
<librato.reporter.version>2.2.0.5</librato.reporter.version>
<dagger.version>1.2.2</dagger.version>
<gaibu.version>0.1.96</gaibu.version>
<gaibu.version>0.1.99</gaibu.version>
</properties>

<distributionManagement>
Expand Down
32 changes: 15 additions & 17 deletions src/main/java/com/hello/suripu/workers/expansions/AlarmActionRecordProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.hello.suripu.workers.expansions;

import com.google.common.base.Optional;
import com.google.common.collect.Sets;
import com.google.protobuf.InvalidProtocolBufferException;

import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException;
import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException;
import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
Expand All @@ -8,38 +12,35 @@
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
import com.google.protobuf.InvalidProtocolBufferException;
import com.hello.suripu.api.expansions.ExpansionProtos;
import com.hello.suripu.core.db.MergedUserInfoDynamoDB;
import com.hello.suripu.core.db.ScheduledRingTimeHistoryDAODynamoDB;
import com.hello.suripu.core.models.AlarmExpansion;
import com.hello.suripu.core.models.ValueRange;
import com.hello.suripu.core.speech.interfaces.Vault;
import com.hello.suripu.workers.framework.HelloBaseRecordProcessor;

import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;
import java.util.Map;
import java.util.Set;

import is.hello.gaibu.core.models.Expansion;
import is.hello.gaibu.core.models.ExpansionData;
import is.hello.gaibu.core.models.ExpansionDeviceData;
import is.hello.gaibu.core.models.ExternalToken;
import is.hello.gaibu.core.stores.ExpansionStore;
import is.hello.gaibu.core.stores.ExternalOAuthTokenStore;
import is.hello.gaibu.core.stores.PersistentExpansionDataStore;
import is.hello.gaibu.core.utils.TokenUtils;
import is.hello.gaibu.homeauto.factories.HomeAutomationExpansionDataFactory;
import is.hello.gaibu.homeauto.factories.HomeAutomationExpansionFactory;
import is.hello.gaibu.homeauto.interfaces.HomeAutomationExpansion;
import is.hello.gaibu.homeauto.models.AlarmActionStatus;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.JedisPool;

import java.util.List;
import java.util.Map;
import java.util.Set;

import static com.codahale.metrics.MetricRegistry.name;

public class AlarmActionRecordProcessor extends HelloBaseRecordProcessor {
Expand All @@ -51,7 +52,6 @@ public class AlarmActionRecordProcessor extends HelloBaseRecordProcessor {
private final ExpansionStore<Expansion> expansionStore;
private final ExternalOAuthTokenStore<ExternalToken> externalTokenStore;
private final PersistentExpansionDataStore expansionDataStore;
private final Vault tokenKMSVault;
private final AlarmActionCheckPointerRedis checkPointer;
private final Alerter alerter;

Expand All @@ -71,7 +71,6 @@ public AlarmActionRecordProcessor(final MergedUserInfoDynamoDB mergedUserInfoDyn
final ExpansionStore<Expansion> expansionStore,
final ExternalOAuthTokenStore<ExternalToken> externalTokenStore,
final PersistentExpansionDataStore expansionDataStore,
final Vault tokenKMSVault,
final JedisPool jedisPool,
final Alerter alerter){

Expand All @@ -82,7 +81,6 @@ public AlarmActionRecordProcessor(final MergedUserInfoDynamoDB mergedUserInfoDyn
this.expansionStore = expansionStore;
this.externalTokenStore = externalTokenStore;
this.expansionDataStore = expansionDataStore;
this.tokenKMSVault = tokenKMSVault;
this.alerter = alerter;

this.actionsExecuted = metrics.meter(name(AlarmActionRecordProcessor.class, "actions-executed"));
Expand Down Expand Up @@ -250,7 +248,7 @@ public Boolean attemptAlarmAction(final String deviceId, final Long expansionId,

final ExpansionDeviceData appData = expansionDeviceDataOptional.get();

final Optional<String> decryptedTokenOptional = TokenUtils.getDecryptedExternalToken(externalTokenStore, tokenKMSVault, deviceId, expansion, false);
final Optional<String> decryptedTokenOptional = externalTokenStore.getDecryptedExternalToken(deviceId, expansion, false);

if(!decryptedTokenOptional.isPresent()) {
LOGGER.error("error=missing-decrypted-token sense_id={} expansion_id={}", deviceId, expansion.id);
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/com/hello/suripu/workers/expansions/AlarmActionRecordProcessorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.hello.suripu.core.db.MergedUserInfoDynamoDB;
import com.hello.suripu.core.db.ScheduledRingTimeHistoryDAODynamoDB;
import com.hello.suripu.core.db.TimeZoneHistoryDAO;
import com.hello.suripu.core.speech.interfaces.Vault;

import is.hello.gaibu.core.models.Expansion;
import is.hello.gaibu.core.models.ExternalToken;
Expand All @@ -29,7 +28,6 @@ public class AlarmActionRecordProcessorFactory implements IRecordProcessorFactor
private final ExpansionStore<Expansion> expansionStore;
private final ExternalOAuthTokenStore<ExternalToken> externalTokenStore;
private final PersistentExpansionDataStore expansionDataStore;
private final Vault tokenKMSVault;
private final JedisPool jedisPool;
private final Alerter alerter;

Expand All @@ -41,7 +39,6 @@ public AlarmActionRecordProcessorFactory(
final ExpansionStore<Expansion> expansionStore,
final ExternalOAuthTokenStore<ExternalToken> externalTokenStore,
final PersistentExpansionDataStore expansionDataStore,
final Vault tokenKMSVault,
final JedisPool jedisPool,
final DeviceDAO deviceDAO,
final AlertsDAO alertsDAO,
Expand All @@ -54,7 +51,6 @@ public AlarmActionRecordProcessorFactory(
this.expansionStore = expansionStore;
this.externalTokenStore = externalTokenStore;
this.expansionDataStore = expansionDataStore;
this.tokenKMSVault = tokenKMSVault;
this.jedisPool = jedisPool;
this.alerter = new AlarmActionAlerter(deviceDAO, alertsDAO, timeZoneHistoryDAO);
}
Expand All @@ -69,7 +65,6 @@ public IRecordProcessor createProcessor() {
this.expansionStore,
this.externalTokenStore,
this.expansionDataStore,
this.tokenKMSVault,
this.jedisPool,
this.alerter
);
Expand Down
33 changes: 20 additions & 13 deletions src/main/java/com/hello/suripu/workers/expansions/AlarmActionWorkerCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.hello.suripu.workers.expansions;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
Expand All @@ -12,8 +15,6 @@
import com.amazonaws.services.kms.AWSKMSClient;
import com.codahale.metrics.graphite.Graphite;
import com.codahale.metrics.graphite.GraphiteReporter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.hello.suripu.core.ObjectGraphRoot;
import com.hello.suripu.core.alerts.AlertsDAO;
import com.hello.suripu.core.configuration.DynamoDBTableName;
Expand All @@ -33,25 +34,29 @@
import com.hello.suripu.coredropwizard.metrics.RegexMetricFilter;
import com.hello.suripu.workers.framework.WorkerEnvironmentCommand;
import com.hello.suripu.workers.framework.WorkerRolloutModule;
import io.dropwizard.jdbi.DBIFactory;
import io.dropwizard.setup.Environment;
import is.hello.gaibu.core.db.ExpansionDataDAO;
import is.hello.gaibu.core.db.ExpansionsDAO;
import is.hello.gaibu.core.db.ExternalTokenDAO;
import is.hello.gaibu.core.stores.PersistentExpansionDataStore;
import is.hello.gaibu.core.stores.PersistentExpansionStore;
import is.hello.gaibu.core.stores.PersistentExternalTokenStore;

import net.sourceforge.argparse4j.inf.Namespace;

import org.skife.jdbi.v2.DBI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.JedisPool;

import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

import io.dropwizard.jdbi.DBIFactory;
import io.dropwizard.setup.Environment;
import is.hello.gaibu.core.db.ExpansionDataDAO;
import is.hello.gaibu.core.db.ExpansionsDAO;
import is.hello.gaibu.core.db.ExternalTokenDAO;
import is.hello.gaibu.core.stores.PersistentExpansionDataStore;
import is.hello.gaibu.core.stores.PersistentExpansionStore;
import is.hello.gaibu.core.stores.PersistentExternalTokenStore;
import okhttp3.OkHttpClient;
import redis.clients.jedis.JedisPool;

public class AlarmActionWorkerCommand extends WorkerEnvironmentCommand<AlarmActionWorkerConfiguration> {
private final static Logger LOGGER = LoggerFactory.getLogger(AlarmActionWorkerCommand.class);

Expand Down Expand Up @@ -150,8 +155,11 @@ public void run(Environment environment, Namespace namespace, final AlarmActionW
final ExpansionsDAO externalApplicationsDAO = commonDB.onDemand(ExpansionsDAO.class);
final PersistentExpansionStore expansionStore = new PersistentExpansionStore(externalApplicationsDAO);

// Required for Nest token revocation
final OkHttpClient httpClient = new OkHttpClient(); //TODO: configure timeouts

final ExternalTokenDAO externalTokenDAO = commonDB.onDemand(ExternalTokenDAO.class);
final PersistentExternalTokenStore externalTokenStore = new PersistentExternalTokenStore(externalTokenDAO, expansionStore);
final PersistentExternalTokenStore externalTokenStore = new PersistentExternalTokenStore(externalTokenDAO, expansionStore, tokenKMSVault, httpClient);

final ExpansionDataDAO expansionDataDAO = commonDB.onDemand(ExpansionDataDAO.class);
final PersistentExpansionDataStore externalAppDataStore = new PersistentExpansionDataStore(expansionDataDAO);
Expand All @@ -172,7 +180,6 @@ public void run(Environment environment, Namespace namespace, final AlarmActionW
expansionStore,
externalTokenStore,
externalAppDataStore,
tokenKMSVault,
jedisPool,
deviceDAO,
alertsDAO,
Expand Down