From 9216ab8252246a263c5d17f6755a7d3887145f94 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 18 Apr 2014 11:55:40 +0200
Subject: change service level configuration strategy

The changes to the configuration required some non minor changes to the platform and also added some flexibility we don't require yet - and thus some new possibilities for errors.

So instead we still use the allow_..._certs and ..._cert_prefix options.
They basically provide the framework in which service levels can operate.

The service level configuration will not include the cert prefix anymore.
It only states if the service level is rate limited or not.
This avoids conflicts between the two configuration options.

I also removed the anonymous service level entirely.
It was also turning a boolean decision (do we provide anonymous eip or not) into something way more complex. Instead I added the AnonymousServiceLevel class to handle the corner cases for people who are not logged in.

Furthermore i renamed the UnauthenticatedUser to AnonymousUser so it matches the Anonymous Service Level nicely. It's also shorter and more intuitive.
---
 app/models/anonymous_service_level.rb | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 app/models/anonymous_service_level.rb

(limited to 'app/models/anonymous_service_level.rb')

diff --git a/app/models/anonymous_service_level.rb b/app/models/anonymous_service_level.rb
new file mode 100644
index 0000000..c51ce9e
--- /dev/null
+++ b/app/models/anonymous_service_level.rb
@@ -0,0 +1,31 @@
+class AnonymousServiceLevel
+
+  delegate :to_json, to: :config_hash
+
+  def cert_prefix
+    if APP_CONFIG[:allow_limited_certs]
+      APP_CONFIG[:limited_cert_prefix]
+    else
+      APP_CONFIG[:unlimited_cert_prefix]
+    end
+  end
+
+  def description
+    if APP_CONFIG[:allow_anonymous_certs]
+      "anonymous access to the VPN"
+    else
+      "please login to access our services"
+    end
+  end
+
+  protected
+
+  def config_hash
+    { name: "anonymous",
+      description: description,
+      cost: 0,
+      eip_rate_limit: APP_CONFIG[:allow_limited_certs]
+    }
+  end
+
+end
-- 
cgit v1.2.3


From 966e390d401b84dad98127e647d2ec634f1cbc15 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 18 Apr 2014 12:39:27 +0200
Subject: bringing back empty cert prefixes

if neither limited nor unlimited certs are allowed there will be no prefix. Not sure if this is desired - but it's the way things used to be before the refactoring
---
 app/models/anonymous_service_level.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models/anonymous_service_level.rb')

diff --git a/app/models/anonymous_service_level.rb b/app/models/anonymous_service_level.rb
index c51ce9e..47b7cfb 100644
--- a/app/models/anonymous_service_level.rb
+++ b/app/models/anonymous_service_level.rb
@@ -5,7 +5,7 @@ class AnonymousServiceLevel
   def cert_prefix
     if APP_CONFIG[:allow_limited_certs]
       APP_CONFIG[:limited_cert_prefix]
-    else
+    elsif APP_CONFIG[:allow_unlimited_certs]
       APP_CONFIG[:unlimited_cert_prefix]
     end
   end
-- 
cgit v1.2.3


From be81b7430e0a2046125be7c3a4b01b8725f4afe6 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 18 Apr 2014 12:51:18 +0200
Subject: adopt service_level config to platform settings

cost  -> rate
quota -> storage
---
 app/models/anonymous_service_level.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/models/anonymous_service_level.rb')

diff --git a/app/models/anonymous_service_level.rb b/app/models/anonymous_service_level.rb
index 47b7cfb..4366a4a 100644
--- a/app/models/anonymous_service_level.rb
+++ b/app/models/anonymous_service_level.rb
@@ -23,7 +23,6 @@ class AnonymousServiceLevel
   def config_hash
     { name: "anonymous",
       description: description,
-      cost: 0,
       eip_rate_limit: APP_CONFIG[:allow_limited_certs]
     }
   end
-- 
cgit v1.2.3