Version update and JWT support

.circleci/config.yml

@@ -0,0 +1,45 @@
+version: 2
+jobs:
+  build:
+    parallelism: 3
+    working_directory: /app
+    docker:
+      - image: circleci/buildpack-deps:18.04-browsers
+        user: root
+    steps:
+      - checkout
+      # Install any system package dependencies.
+      - run: env INSTALL_TEST_DEPENDENCIES=true ./tasks/install-system-build-dependencies
+      - restore_cache:
+          # CircleCI's prefix based matching will mean the cache from the last
+          # cache for this branch will be restored.
+          key: cache-build-deps-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ arch }}-
+      # The bootstrap's "task" file will be cached on subsequent runs, but due
+      # to the reliance on timestamps, this fact might not get picked up in the
+      # CI environment. So if a stamp file exists for the initial bootstrap
+      # process, re-touch it to prevent re-downloads.
+      - run: touch -c build/work/stamp/bootstrap-*
+      # Build all the API Umbrella software dependencies.
+      - run: ./configure
+      - run: make all test-deps
+      - run: make clean:dev
+      # Cache the staged build data and task checksums of what's been
+      # completed.
+      - save_cache:
+          key: cache-build-deps-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ arch }}-{{ epoch }}
+          paths:
+            - .task
+            - build/work/dev-env
+            - build/work/stage
+            - build/work/stamp
+            - build/work/task
+            - build/work/tasks
+            - build/work/test-env
+      - run: groupadd -r api-umbrella && useradd -r -g api-umbrella -s /sbin/nologin -d /opt/api-umbrella -c "API Umbrella user" api-umbrella
+      - run: make test:circle-ci
+      - store_test_results:
+          path: test/tmp/reports
+      - store_artifacts:
+          path: test/tmp/run/api-umbrella-root/var/log
+      - store_artifacts:
+          path: test/tmp/capybara

.dockerignore

@@ -1,31 +1,19 @@
-# CMake
-CMakeCache.txt
-CMakeFiles
-Makefile
-cmake_install.cmake
-install_manifest.txt
-install_manifest_core.txt
-install_manifest_hadoop-analytics.txt
-
+.task
 build/work
 build/package/work
+build/package/verify/.rnd
 
 .vagrant
 workspace
 chef/cookbooks
 chef/tmp
 .bundle
 .ruby-version
-CMakeCache.txt
-CMakeFiles
+Dockerfile*
 Makefile
-cmake_install.cmake
+docker-compose.yml
 install_manifest.txt
 install_manifest_core.txt
-install_manifest_hadoop-analytics.txt
-build/work
-build/package/work
-build/package/verify/.rnd
 deploy/.env
 deploy/log
 deploy/tmp

.gitignore

@@ -17,18 +17,13 @@
 # Ignore bundler config
 /.bundle
 
-# Ignore Circle CI items, so the GitHub pages publish task can work. 
+# Ignore Circle CI items, so the GitHub pages publish task can work.
 /.ruby-version
 
-# CMake
-/CMakeCache.txt
-/CMakeFiles
-/Makefile
-/cmake_install.cmake
-/install_manifest.txt
-/install_manifest_core.txt
-/install_manifest_hadoop-analytics.txt
+# Build task checksums
+/.task
 
+/Makefile
 /build/work
 /build/package/work
 /build/package/verify/.rnd

.luacheckrc

@@ -1,12 +1,28 @@
 std = "ngx_lua"
 
 globals = {
-  "DEBUG",
   "WORKER_GROUP_ID",
-  "config",
-  "elasticsearch_templates",
-  "inspect",
-  "user_agent_parser_data",
 }
 
 max_line_length = false
+
+files["src/api-umbrella/auto-ssl"] = {
+  globals = {
+    "auto_ssl",
+  },
+}
+
+files["templates/etc/trafficserver"] = {
+  std = "luajit",
+  globals = {
+    "TS_LUA_CACHE_LOOKUP_HIT_FRESH",
+    "TS_LUA_CACHE_LOOKUP_HIT_STALE",
+    "TS_LUA_REMAP_DID_REMAP",
+    "do_global_read_request",
+    "do_global_read_response",
+    "do_global_send_request",
+    "do_global_send_response",
+    "do_remap",
+    "ts",
+  },
+}

.rubocop.yml

@@ -1,13 +1,51 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Exclude:
     - bin/**/*
+    - scripts/**/*
+    - src/api-umbrella/web-app/bin/**/*
+    - src/api-umbrella/web-app/tmp/**/*
+    - src/api-umbrella/web-app/vendor/**/*
     - tmp/**/*
     - vendor/**/*
 
 Rails:
   Enabled: true
 
+Bundler/OrderedGems:
+  Enabled: false
+
+Layout/AlignHash:
+  # https://github.com/rubocop-hq/rubocop/issues/6291
+  EnforcedLastArgumentHashStyle: ignore_implicit
+
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: start_of_line
+
+Layout/FirstParameterIndentation:
+  EnforcedStyle: consistent
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Layout/SpaceAroundKeyword:
+  Enabled: false
+
 Lint/AssignmentInCondition:
   AllowSafeAssignment: false
 
@@ -53,22 +91,10 @@ Naming/HeredocDelimiterNaming:
 Performance/RedundantMerge:
   Enabled: false
 
-Layout/AlignHash:
-  Enabled: false
-
-Layout/AlignParameters:
-  Enabled: false
-
-Layout/EmptyLinesAroundArguments:
+Rails/FindBy:
   Enabled: false
 
-Layout/IndentArray:
-  EnforcedStyle: consistent
-
-Layout/IndentHash:
-  EnforcedStyle: consistent
-
-Layout/SpaceAroundKeyword:
+Rails/HasAndBelongsToMany:
   Enabled: false
 
 Style/AsciiComments:
@@ -81,30 +107,24 @@ Style/ClassAndModuleChildren:
   Enabled: false
 
 Style/ClassCheck:
-  Enabled: false
+  EnforcedStyle: kind_of?
 
 Style/CollectionMethods:
   PreferredMethods:
-    find: 'detect'
+    find: detect
 
 Style/ConditionalAssignment:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 
-Style/EachWithObject:
-  Enabled: false
-
 Style/EmptyElse:
   EnforcedStyle: empty
 
 Style/EmptyMethod:
   Enabled: false
 
-Style/Encoding:
-  Enabled: false
-
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -133,7 +153,7 @@ Style/NumericLiterals:
   Enabled: false
 
 Style/NumericPredicate:
-  Enabled: false
+  EnforcedStyle: comparison
 
 Style/OneLineConditional:
   Enabled: false
@@ -163,10 +183,10 @@ Style/SignalException:
   Enabled: false
 
 Style/StringLiterals:
-  Enabled: false
+  EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
-  Enabled: false
+  EnforcedStyle: double_quotes
 
 Style/SymbolArray:
   Enabled: false
@@ -187,17 +207,4 @@ Style/WhileUntilModifier:
   Enabled: false
 
 Style/WordArray:
-  Enabled: false
-
-Rails/Delegate:
-  Enabled: false
-
-Rails/FindBy:
-  Enabled: false
-
-Rails/HasAndBelongsToMany:
-  Enabled: false
-
-Rails/Output:
-  Exclude:
-    - db/migrate/**
+  EnforcedStyle: brackets

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - **Fix URL handling for query strings containing "api\_key":** It was possible that API Umbrella was stripping the string "api\_key" from inside URLs before passing requests to the API backend in some unexpected cases. The `api_key` query parameter should still be stripped, but other instances of "api\_key" elsewhere in the URL (for example as a value, like `?foo=api_key`), are now retained.
+- **Fix redirect rewriting when operating on custom ports:** If API Umbrella was running on custom HTTP or HTTP ports, redirects from API backends may not have been to the correct port.
 
 ## 0.14.4 (2017-07-15)