More issues to iron out, still testing hashing properly

analytics.go

@@ -76,6 +76,9 @@ type RedisAnalyticsHandler struct {
 
 // RecordHit will store an AnalyticsRecord in Redis
 func (r RedisAnalyticsHandler) RecordHit(thisRecord AnalyticsRecord) error {
+	// If we are obfuscating API Keys, store the hashed representation (config check handled in hashing function)
+	thisRecord.APIKey = getHash(thisRecord.APIKey)
+
 	encoded, err := msgpack.Marshal(thisRecord)
 	u5, _ := uuid.NewV4()
 

config.go

@@ -47,6 +47,7 @@ type Config struct {
 	} `json:"health_check"`
 	UseAsyncSessionWrite bool `json:"optimisations_use_async_session_write"`
     AllowMasterKeys bool `json:"allow_master_keys"`
+    HashKeys bool `json:"hash_keys"`
 }
 
 // WriteDefaultConf will create a default configuration file and set the storage type to "memory"

session_manager.go

@@ -66,7 +66,7 @@ type SessionLimiter struct{}
 // Key values to manage rate are Rate and Per, e.g. Rate of 10 messages Per 10 seconds
 func (l SessionLimiter) ForwardMessage(currentSession *SessionState, key string, store StorageHandler) (bool, int) {
 
-	rateLimiterKey := RateLimitKeyPrefix + key
+	rateLimiterKey := RateLimitKeyPrefix + getHash(key)
 	ratePerPeriodNow := store.IncrememntWithExpire(rateLimiterKey, int64(currentSession.Per))
 
 	if ratePerPeriodNow > (int64(currentSession.Rate)) {
@@ -120,7 +120,7 @@ func (l SessionLimiter) IsRedisQuotaExceeded(currentSession *SessionState, key s
 	}
 
 	// Create the key
-	rawKey := QuotaKeyPrefix + key
+	rawKey := QuotaKeyPrefix + getHash(key)
 
 	// INCR the key (If it equals 1 - set EXPIRE)
 	qInt := store.IncrememntWithExpire(rawKey, currentSession.QuotaRenewalRate)

storage_handlers.go

@@ -165,6 +165,10 @@ func (r *RedisStorageManager) Connect() bool {
 }
 
 func getHash(in string) string {
+	// if !config.HashKeys {
+		// Not hashing? Return the raw key
+	// 	return in
+	// }
 	var h128 murmur3.Hash128 = murmur3.New128()
 	h128.Write([]byte(in))
 	return hex.EncodeToString(h128.Sum(nil))