cfn-vpn 0.5.1 → 1.3.1

data/docs/scheduling.md

@@ -0,0 +1,32 @@
+# Stop and Start Client-VPN
+
+Stopping and starting the VPN can help save AWS costs when you're not using the VPN. AWS pricing model for Client-VPN is per associated subnet per hour so we can achieve this by disassociating the subnets when the VPN is not required and the associated them again when required.
+
+This can be achieved through `cfn-vpn` in 2 ways, by a cli command or via a cloudwatch event schedule.
+
+## CLI Command
+
+Use the following commands to stop and start your Client-VPN
+
+### Disassociate
+
+```sh
+cfn-vpn subnets [name] --disassociate
+```
+
+### Associate
+
+```sh
+cfn-vpn subnets [name] --associate
+```
+
+## Schedule
+
+A CloudWatch cron schedule with a lambda function can be setup to stop and start your Client-VPN. This can be achieved by modifying the `cfn-vpn` stack with the required cron schedules.
+To see the CloudWatch cron syntax please visit the [AWS docs](https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html#CronExpressions) for further info
+
+```sh
+cfn-vpn modify [name] --stop "10 6 * * ? *" --start "00 20 ? * MON-FRI *"
+```
+
+One or both of `--start` and `--stop` can be supplied, for example if you wanted an on demand start with a scheduled stop.

data/docs/sessions.md

@@ -0,0 +1,27 @@
+# Managing Client-VPN Sessions
+
+## Show Sessions
+
+This is show a table of current connections on the vpn. You can then kill sessions by using the connection id.
+
+```sh
+cfn-vpn sessions [name]
+```
+
+The sessions are displayed in a table format
+
+```bash
++-------------+---------------------+--------+-------------+-----------------------------------+---------------+--------------+
+| Common Name | Connected (UTC)     | Status | IP Address  | Connection ID                     | Ingress Bytes | Egress Bytes |
++-------------+---------------------+--------+-------------+-----------------------------------+---------------+--------------+
+| user1       | 2019-06-28 04:58:19 | active | 10.250.0.98 | cvpn-connection-05bcc579cb3fdf9a3 | 3000          | 2679         |
++-------------+---------------------+--------+-------------+-----------------------------------+---------------+--------------+
+```
+
+## Terminate a Session
+
+To terminate a Client-VPN session specify the `--kill` flag with the connection id to kill the session.
+
+```sh
+cfn-vpn sessions myvpn --kill cvpn-connection-05bcc579cb3fdf9a3
+```

data/lib/cfnvpn.rb

@@ -1,14 +1,15 @@
 require 'thor'
 require 'cfnvpn/version'
-require 'cfnvpn/init'
-require 'cfnvpn/modify'
-require 'cfnvpn/config'
-require 'cfnvpn/client'
-require 'cfnvpn/revoke'
-require 'cfnvpn/sessions'
-require 'cfnvpn/routes'
-require 'cfnvpn/share'
-require 'cfnvpn/embedded'
+require 'cfnvpn/actions/init'
+require 'cfnvpn/actions/modify'
+require 'cfnvpn/actions/client'
+require 'cfnvpn/actions/revoke'
+require 'cfnvpn/actions/sessions'
+require 'cfnvpn/actions/routes'
+require 'cfnvpn/actions/share'
+require 'cfnvpn/actions/embedded'
+require 'cfnvpn/actions/subnets'
+require 'cfnvpn/actions/params'
 
 module CfnVpn
   class Cli < Thor
@@ -19,32 +20,35 @@ module CfnVpn
       puts CfnVpn::VERSION
     end
 
-    register CfnVpn::Init, 'init', 'init [name]', 'Create a AWS Client VPN'
-    tasks["init"].options = CfnVpn::Init.class_options
+    register CfnVpn::Actions::Init, 'init', 'init [name]', 'Create a AWS Client VPN'
+    tasks["init"].options = CfnVpn::Actions::Init.class_options
 
-    register CfnVpn::Modify, 'modify', 'modify [name]', 'Modify your AWS Client VPN'
-    tasks["modify"].options = CfnVpn::Modify.class_options
+    register CfnVpn::Actions::Modify, 'modify', 'modify [name]', 'Modify your AWS Client VPN'
+    tasks["modify"].options = CfnVpn::Actions::Modify.class_options
 
-    register CfnVpn::Config, 'config', 'config [name]', 'Retrieve the config for the AWS Client VPN'
-    tasks["config"].options = CfnVpn::Config.class_options
+    register CfnVpn::Actions::Client, 'client', 'client [name]', 'Create a new client certificate'
+    tasks["client"].options = CfnVpn::Actions::Client.class_options
 
-    register CfnVpn::Client, 'client', 'client [name]', 'Create a new client certificate'
-    tasks["client"].options = CfnVpn::Client.class_options
+    register CfnVpn::Actions::Revoke, 'revoke', 'revoke [name]', 'Revoke a client certificate'
+    tasks["revoke"].options = CfnVpn::Actions::Revoke.class_options
 
-    register CfnVpn::Revoke, 'revoke', 'revoke [name]', 'Revoke a client certificate'
-    tasks["revoke"].options = CfnVpn::Revoke.class_options
+    register CfnVpn::Actions::Sessions, 'sessions', 'sessions [name]', 'List and kill current vpn connections'
+    tasks["sessions"].options = CfnVpn::Actions::Sessions.class_options
 
-    register CfnVpn::Sessions, 'sessions', 'sessions [name]', 'List and kill current vpn connections'
-    tasks["sessions"].options = CfnVpn::Sessions.class_options
+    register CfnVpn::Actions::Routes, 'routes', 'routes [name]', 'List, add or delete client vpn routes'
+    tasks["routes"].options = CfnVpn::Actions::Routes.class_options
 
-    register CfnVpn::Routes, 'routes', 'routes [name]', 'List, add or delete client vpn routes'
-    tasks["routes"].options = CfnVpn::Routes.class_options
+    register CfnVpn::Actions::Share, 'share', 'share [name]', 'Provide a user with a s3 signed download for certificates and config'
+    tasks["share"].options = CfnVpn::Actions::Share.class_options
 
-    register CfnVpn::Share, 'share', 'share [name]', 'Provide a user with a s3 signed download for certificates and config'
-    tasks["share"].options = CfnVpn::Share.class_options
+    register CfnVpn::Actions::Embedded, 'embedded', 'embedded [name]', 'Embed client certs into config and generate S3 presigned URL'
+    tasks["embedded"].options = CfnVpn::Actions::Embedded.class_options
 
-    register CfnVpn::Embedded, 'embedded', 'embedded [name]', 'Embed client certs into config and generate S3 presigned URL'
-    tasks["embedded"].options = CfnVpn::Embedded.class_options
+    register CfnVpn::Actions::Subnets, 'subnets', 'subnets [name]', 'Manage subnet associations for the client vpn'
+    tasks["subnets"].options = CfnVpn::Actions::Subnets.class_options
+
+    register CfnVpn::Actions::Params, 'params', 'params [name]', 'Display or dump to yaml the current cfnvpn params'
+    tasks["params"].options = CfnVpn::Actions::Params.class_options
 
   end
 end

data/lib/cfnvpn/{client.rb → actions/client.rb}

@@ -4,10 +4,9 @@ require 'cfnvpn/log'
 require 'cfnvpn/s3'
 require 'cfnvpn/globals'
 
-module CfnVpn
+module CfnVpn::Actions
   class Client < Thor::Group
-    include Thor::Actions
-    include CfnVpn::Log
+    include Thor::Actions  
 
     argument :name
 
@@ -24,7 +23,7 @@ module CfnVpn
     end
 
     def set_loglevel
-      Log.logger.level = Logger::DEBUG if @options['verbose']
+      CfnVpn::Log.logger.level = Logger::DEBUG if @options['verbose']
     end
 
     def set_directory
@@ -36,9 +35,9 @@ module CfnVpn
     def create_certificate
       s3 = CfnVpn::S3.new(@options['region'],@options['bucket'],@name)
       s3.get_object("#{@cert_dir}/ca.tar.gz")
-      Log.logger.info "Generating new client certificate #{@options['client_cn']} using openvpn easy-rsa"
+      CfnVpn::Log.logger.info "Generating new client certificate #{@options['client_cn']} using openvpn easy-rsa"
       cert = CfnVpn::Certificates.new(@build_dir,@name,@options['easyrsa_local'])
-      Log.logger.debug cert.generate_client(@options['client_cn'])
+      CfnVpn::Log.logger.debug cert.generate_client(@options['client_cn'])
       s3.store_object("#{@cert_dir}/#{@options['client_cn']}.tar.gz")
     end
 

data/lib/cfnvpn/{embedded.rb → actions/embedded.rb}

@@ -2,10 +2,10 @@ require 'cfnvpn/log'
 require 'cfnvpn/s3'
 require 'cfnvpn/globals'
 
-module CfnVpn
+module CfnVpn::Actions
   class Embedded < Thor::Group
     include Thor::Actions
-    include CfnVpn::Log
+    
 
     argument :name
 
@@ -23,13 +23,13 @@ module CfnVpn
     end
 
     def set_loglevel
-      Log.logger.level = Logger::DEBUG if @options['verbose']
+      CfnVpn::Log.logger.level = Logger::DEBUG if @options['verbose']
     end
 
     def create_config_directory
       @build_dir = "#{CfnVpn.cfnvpn_path}/#{@name}"
       @config_dir = "#{@build_dir}/config"
-      Log.logger.debug("Creating config directory #{@config_dir}")
+      CfnVpn::Log.logger.debug("Creating config directory #{@config_dir}")
       FileUtils.mkdir_p(@config_dir)
     end
 
@@ -40,18 +40,18 @@ module CfnVpn
       end
 
       if download
-        Log.logger.info "Downloading certificates for #{@options['client_cn']} to #{@config_dir}"
+        CfnVpn::Log.logger.info "Downloading certificates for #{@options['client_cn']} to #{@config_dir}"
         s3 = CfnVpn::S3.new(@options['region'],@options['bucket'],@name)
         s3.get_object("#{@config_dir}/#{@options['client_cn']}.tar.gz")
         cert = CfnVpn::Certificates.new(@build_dir,@name,@options['easyrsa_local'])
-        Log.logger.debug cert.extract_certificate(@options['client_cn'])
+        CfnVpn::Log.logger.debug cert.extract_certificate(@options['client_cn'])
       end
     end
 
     def download_config
       vpn = CfnVpn::ClientVpn.new(@name,@options['region'])
       @endpoint_id = vpn.get_endpoint_id()
-      Log.logger.debug "downloading client config for #{@endpoint_id}"
+      CfnVpn::Log.logger.debug "downloading client config for #{@endpoint_id}"
       @config = vpn.get_config(@endpoint_id)
       string = (0...8).map { (65 + rand(26)).chr.downcase }.join
       @config.sub!(@endpoint_id, "#{string}.#{@endpoint_id}")
@@ -59,17 +59,17 @@ module CfnVpn
 
     def add_routes
       if @options['ignore_routes']
-        Log.logger.debug "Ignoring routes pushed by the client vpn"
+        CfnVpn::Log.logger.debug "Ignoring routes pushed by the client vpn"
         @config.concat("\nroute-nopull\n")
         vpn = CfnVpn::ClientVpn.new(@name,@options['region'])
         routes = vpn.get_route_with_mask
-        Log.logger.debug "Found routes #{routes}"
+        CfnVpn::Log.logger.debug "Found routes #{routes}"
         routes.each do |r|
           @config.concat("route #{r[:route]} #{r[:mask]}\n")
         end
         dns_servers = vpn.get_dns_servers()
         if dns_servers.any?
-          Log.logger.debug "Found DNS servers #{dns_servers.join(' ')}"
+          CfnVpn::Log.logger.debug "Found DNS servers #{dns_servers.join(' ')}"
           @config.concat("dhcp-option DNS #{dns_servers.first}\n")
         end
       end
@@ -77,11 +77,11 @@ module CfnVpn
 
     def embed_certs
       cert = CfnVpn::Certificates.new(@build_dir,@name,@options['easyrsa_local'])
-      Log.logger.debug cert.extract_certificate(@options['client_cn'])
-      Log.logger.debug "Reading extracted certificate and private key"
+      CfnVpn::Log.logger.debug cert.extract_certificate(@options['client_cn'])
+      CfnVpn::Log.logger.debug "Reading extracted certificate and private key"
       key = File.read("#{@config_dir}/#{@options['client_cn']}.key")
       crt = File.read("#{@config_dir}/#{@options['client_cn']}.crt")
-      Log.logger.debug "Embedding certificate and private key into config"
+      CfnVpn::Log.logger.debug "Embedding certificate and private key into config"
       @config.concat("\n<key>\n#{key}\n</key>\n")
       @config.concat("\n<cert>\n#{crt}\n</cert>\n")
     end
@@ -94,11 +94,11 @@ module CfnVpn
     def get_presigned_url
       @cn = @options['client_cn']
       @config_url = @s3.get_url("#{@name}_#{@cn}.config.ovpn")
-      Log.logger.debug "Config presigned url: #{@config_url}"
+      CfnVpn::Log.logger.debug "Config presigned url: #{@config_url}"
     end
     
     def display_url
-      Log.logger.info "Share the below instructions with the user..."
+      CfnVpn::Log.logger.info "Share the below instructions with the user..."
       say "\nDownload the embedded config from the below presigned URL which will expire in 1 hour."
       say "\nConfig:\n"
       say "\tcurl #{@config_url} > #{@name}_#{@cn}.config.ovpn", :cyan

data/lib/cfnvpn/actions/init.rb

@@ -0,0 +1,144 @@
+require 'thor'
+require 'fileutils'
+require 'cfnvpn/deployer'
+require 'cfnvpn/certificates'
+require 'cfnvpn/compiler'
+require 'cfnvpn/log'
+require 'cfnvpn/clientvpn'
+require 'cfnvpn/globals'
+require 'cfnvpn/s3_bucket'
+
+module CfnVpn::Actions
+  class Init < Thor::Group
+    include Thor::Actions
+    
+
+    argument :name
+
+    class_option :region, aliases: :r, default: ENV['AWS_REGION'], desc: 'AWS Region'
+    class_option :verbose, desc: 'set log level to debug', type: :boolean
+
+    class_option :server_cn, required: true, desc: 'server certificate common name'
+    class_option :client_cn, desc: 'client certificate common name'
+    class_option :easyrsa_local, type: :boolean, default: false, desc: 'run the easyrsa executable from your local rather than from docker'
+    class_option :bucket, desc: 's3 bucket, if not set one will be generated for you'
+
+    class_option :subnet_ids, required: true, type: :array, desc: 'subnet id to associate your vpn with'
+    class_option :default_groups, default: [], type: :array, desc: 'groups to allow through the subnet associations when using federated auth'
+    class_option :cidr, default: '10.250.0.0/16', desc: 'cidr from which to assign client IP addresses'
+    class_option :dns_servers, default: [], type: :array, desc: 'DNS Servers to push to clients.'
+    
+    class_option :split_tunnel, type: :boolean, default: true, desc: 'only push routes to the client on the vpn endpoint'
+    class_option :internet_route, type: :string, desc: '[subnet-id] create a default route to the internet through a subnet'
+    class_option :protocol, type: :string, default: 'udp', enum: ['udp','tcp'], desc: 'set the protocol for the vpn connections'
+
+    class_option :start, type: :string, desc: 'cloudwatch event cron schedule in UTC to associate subnets to the client vpn'
+    class_option :stop, type: :string, desc: 'cloudwatch event cron schedule in UTC to disassociate subnets to the client vpn'
+
+    class_option :saml_arn, desc: 'IAM SAML idenditiy providor arn if using SAML federated authentication'
+    class_option :directory_id, desc: 'AWS Directory Service directory id if using Active Directory authentication'
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    def set_loglevel
+      CfnVpn::Log.logger.level = Logger::DEBUG if @options['verbose']
+    end
+
+    def create_build_directory
+      @build_dir = "#{CfnVpn.cfnvpn_path}/#{@name}"
+      CfnVpn::Log.logger.debug "creating directory #{@build_dir}"
+      FileUtils.mkdir_p(@build_dir)
+    end
+
+    def initialize_config
+      @config = {
+        region: @options['region'],
+        subnet_ids: @options['subnet_ids'],
+        cidr: @options['cidr'],
+        dns_servers: @options['dns_servers'],
+        split_tunnel: @options['split_tunnel'],
+        internet_route: @options['internet_route'],
+        protocol: @options['protocol'],
+        start: @options['start'],
+        stop: @options['stop'],
+        saml_arn: @options['saml_arn'],
+        directory_id: @options['directory_id'],
+        routes: []
+      }
+    end
+
+    def create_bucket_if_bucket_not_set
+      if !@options['bucket']
+        CfnVpn::Log.logger.info "creating s3 bucket"
+        bucket = CfnVpn::S3Bucket.new(@options['region'], @name)
+        bucket_name = bucket.generate_bucket_name
+        bucket.create_bucket(bucket_name)
+        @config[:bucket] = bucket_name
+      else
+        @config[:bucket] = @options['bucket']
+      end
+    end
+
+    def set_type
+      if @options['saml_arn']
+        @config[:type] = 'federated'
+        @config[:default_groups] = @options['default_groups']
+      elsif @options['directory_id']
+        @config[:type] = 'active-directory'
+        @config[:default_groups] = @options['default_groups']
+      else
+        @config[:type] = 'certificate'
+        @config[:default_groups] = []
+      end
+      CfnVpn::Log.logger.info "initialising #{@config[:type]} client vpn"
+    end
+
+    def stack_exist
+      @deployer = CfnVpn::Deployer.new(@options['region'],@name)
+      if @deployer.does_cf_stack_exist()
+        CfnVpn::Log.logger.error "#{@name}-cfnvpn stack already exists in this account in region #{@options['region']}, use the modify command to alter the stack"
+        exit 1
+      end
+    end
+
+    # create certificates
+    def generate_server_certificates
+      CfnVpn::Log.logger.info "Generating certificates using openvpn easy-rsa"
+      cert = CfnVpn::Certificates.new(@build_dir,@name,@options['easyrsa_local'])
+      @client_cn = @options['client_cn'] ? @options['client_cn'] : "client-vpn.#{@options['server_cn']}"
+      cert.generate_ca(@options['server_cn'],@client_cn)
+    end
+
+    def upload_certificates
+      cert = CfnVpn::Certificates.new(@build_dir,@name,@options['easyrsa_local'])
+      @config[:server_cert_arn] = cert.upload_certificates(@options['region'],'server','server',@options['server_cn'])
+      if @config[:type] == 'certificate'
+         # we only need the server certificate to ACM if it is a SAML federated client vpn
+        @config[:client_cert_arn] = cert.upload_certificates(@options['region'],@client_cn,'client')
+        # and only need to upload the certs to s3 if using certificate authenitcation
+        s3 = CfnVpn::S3.new(@options['region'],@config[:bucket],@name)
+        s3.store_object("#{@build_dir}/certificates/ca.tar.gz")
+      end
+    end
+
+    def deploy_vpn
+      compiler = CfnVpn::Compiler.new(@name, @config)
+      template_body = compiler.compile
+      CfnVpn::Log.logger.info "Launching cloudformation stack #{@name}-cfnvpn in #{@options['region']}"
+      change_set, change_set_type = @deployer.create_change_set(template_body: template_body)
+      @deployer.wait_for_changeset(change_set.id)
+      @deployer.execute_change_set(change_set.id)
+      @deployer.wait_for_execute(change_set_type)
+      CfnVpn::Log.logger.info "Changeset #{change_set_type} complete"
+    end
+
+    def finish
+      vpn = CfnVpn::ClientVpn.new(@name,@options['region'])
+      @endpoint_id = vpn.get_endpoint_id()
+      CfnVpn::Log.logger.info "Client VPN #{@endpoint_id} created. Run `cfn-vpn config #{@name}` to setup the client config"
+    end
+
+  end
+end

data/lib/cfnvpn/actions/modify.rb

@@ -0,0 +1,169 @@
+require 'thor'
+require 'fileutils'
+require 'terminal-table'
+require 'cfnvpn/deployer'
+require 'cfnvpn/certificates'
+require 'cfnvpn/compiler'
+require 'cfnvpn/log'
+require 'cfnvpn/clientvpn'
+require 'cfnvpn/globals'
+require 'cfnvpn/config'
+require 'cfnvpn/s3_bucket'
+
+module CfnVpn::Actions
+  class Modify < Thor::Group
+    include Thor::Actions
+    
+
+    argument :name
+
+    class_option :region, aliases: :r, default: ENV['AWS_REGION'], desc: 'AWS Region'
+    class_option :verbose, desc: 'set log level to debug', type: :boolean
+
+    class_option :subnet_ids, type: :array, desc: 'overwrite all subnet associations'
+    class_option :add_subnet_ids, type: :array, desc: 'add to existing subnet associations'
+    class_option :del_subnet_ids, type: :array, desc: 'delete subnet associations'
+
+    class_option :default_groups, type: :array, desc: 'groups to allow through the subnet associations when using federated auth'
+
+    class_option :dns_servers, type: :array, desc: 'DNS Servers to push to clients.'
+    class_option :no_dns_servers, type: :boolean, desc: 'Remove the DNS Servers from the client vpn'
+
+    class_option :cidr, desc: 'cidr from which to assign client IP addresses'
+    class_option :split_tunnel, type: :boolean, desc: 'only push routes to the client on the vpn endpoint'
+    class_option :internet_route, type: :string, desc: '[subnet-id] create a default route to the internet through a subnet'
+    class_option :protocol, type: :string, enum: ['udp','tcp'], desc: 'set the protocol for the vpn connections'
+
+    class_option :start, type: :string, desc: 'cloudwatch event cron schedule in UTC to associate subnets to the client vpn'
+    class_option :stop, type: :string, desc: 'cloudwatch event cron schedule in UTC to disassociate subnets to the client vpn'
+
+    class_option :param_yaml, type: :string, desc: 'pass in cfnvpn params through YAML file'
+
+    class_option :bucket, desc: 's3 bucket'
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    def set_loglevel
+      CfnVpn::Log.logger.level = Logger::DEBUG if @options['verbose']
+    end
+
+    def create_build_directory
+      @build_dir = "#{CfnVpn.cfnvpn_path}/#{@name}"
+      CfnVpn::Log.logger.debug "creating directory #{@build_dir}"
+      FileUtils.mkdir_p(@build_dir)
+    end
+
+    def stack_exist
+      @deployer = CfnVpn::Deployer.new(@options['region'],@name)
+      if !@deployer.does_cf_stack_exist()
+        CfnVpn::Log.logger.error "#{@name}-cfnvpn stack doesn't exists in this account in region #{@options['region']}\n Try running `cfn-vpn init #{@name}` to setup the stack"
+        exit 1
+      end
+    end
+
+    def initialize_config
+      @config = CfnVpn::Config.get_config(@options[:region], @name)
+
+      CfnVpn::Log.logger.debug "Current config:\n#{@config}"
+
+      if @options[:param_yaml]
+        CfnVpn::Log.logger.debug "Loading config from YAML file #{@options[:param_yaml]}"
+        @config = CfnVpn::Config.get_config_from_yaml_file(@options[:param_yaml])
+      else
+        CfnVpn::Log.logger.debug "Loading config from options"
+        @options.each do |key, value|
+          next if [:verbose].include? key
+          @config[key.to_sym] = value
+        end
+
+        if @options['add_subnet_ids']
+          @config[:subnet_ids].concat @options['add_subnet_ids']
+        end
+
+        if @options['del_subnet_ids']
+          @config[:subnet_ids].reject!{ |subnet| @options['del_subnet_ids'].include? subnet }
+        end
+
+        if @options['no_dns_servers']
+          @config[:dns_servers] = []
+        end
+      end
+
+      if (@config[:saml_arn] || @config[:directory_id]) && @options[:default_groups]
+        @config[:default_groups] = @options[:default_groups]
+      end
+
+      CfnVpn::Log.logger.debug "Modified config:\n#{@config}"
+    end
+
+    def create_bucket_if_bucket_not_set
+      if !@options['bucket'] && !@config.has_key?(:bucket)
+        if yes? "no s3 bucket supplied in the command or found in the config, select (Y) to generate a new one ot select (N) and re run teh command with the --bucket flag to import the existing bucket." 
+          CfnVpn::Log.logger.info "creating s3 bucket"
+          bucket = CfnVpn::S3Bucket.new(@options['region'], @name)
+          bucket_name = bucket.generate_bucket_name
+          bucket.create_bucket(bucket_name)
+          @config[:bucket] = bucket_name
+        else
+          CfnVpn::Log.logger.info "rerun cfn-vpn modify #{name} command with the --bucket [BUCKET] flag"
+          exit 1
+        end
+      elsif @options['bucket']
+        @config[:bucket] = @options['bucket']
+      end
+    end
+
+    def deploy_vpn
+      compiler = CfnVpn::Compiler.new(@name, @config)
+      template_body = compiler.compile
+      CfnVpn::Log.logger.info "Creating cloudformation changeset for stack #{@name}-cfnvpn in #{@options['region']}"
+      change_set, change_set_type = @deployer.create_change_set(template_body: template_body)
+      @deployer.wait_for_changeset(change_set.id)
+      changeset_response = @deployer.get_change_set(change_set.id)
+
+      changes = {"Add" => [], "Modify" => [], "Remove" => []}
+      change_colours = {"Add" => "green", "Modify" => 'yellow', "Remove" => 'red'}
+
+      changeset_response.changes.each do |change|
+        action = change.resource_change.action
+        changes[action].push([
+          change.resource_change.logical_resource_id,
+          change.resource_change.resource_type,
+          change.resource_change.replacement ? change.resource_change.replacement : 'N/A',
+          change.resource_change.details.collect {|detail| detail.target.name }.join(' , ')
+        ])
+      end
+
+      changes.each do |type, rows|
+        next if !rows.any?
+        puts "\n"
+        table = Terminal::Table.new(
+          :title => type,
+          :headings => ['Logical Resource Id', 'Resource Type', 'Replacement', 'Changes'],
+          :rows => rows)
+        puts table.to_s.send(change_colours[type])
+      end
+
+      CfnVpn::Log.logger.info "Cloudformation changeset changes:"
+      puts "\n"
+      continue = yes? "Continue?", :green
+      if !continue
+        CfnVpn::Log.logger.info("Cancelled cfn-vpn modifiy #{@name}")
+        exit 1
+      end
+
+      @deployer.execute_change_set(change_set.id)
+      @deployer.wait_for_execute(change_set_type)
+      CfnVpn::Log.logger.info "Changeset #{change_set_type} complete"
+    end
+
+    def finish
+      vpn = CfnVpn::ClientVpn.new(@name,@options['region'])
+      @endpoint_id = vpn.get_endpoint_id()
+      CfnVpn::Log.logger.info "Client VPN #{@endpoint_id} modified."
+    end
+
+  end
+end