aaa.git
6 years agoFix checkstyle issues to enforce it 32/63232/6
David Suarez [Sun, 11 Mar 2018 15:37:20 +0000 (16:37 +0100)]
Fix checkstyle issues to enforce it

Change-Id: I77b3e119c7cd972f1f2f141f5adfdeab6c518ead
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>
6 years agoRemove static AuthenticationManager instance 77/69577/4
Tom Pantelis [Sat, 17 Mar 2018 01:24:05 +0000 (21:24 -0400)]
Remove static AuthenticationManager instance

It's only used by UT's.

Change-Id: I25271cd06d578942b7cf9cd35a38a338c5527f29
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove ServiceLocator 74/69574/3
Tom Pantelis [Fri, 16 Mar 2018 22:59:35 +0000 (18:59 -0400)]
Remove ServiceLocator

Removed the static instance holders in favor of injection.

Change-Id: Iea7beda16450f28af4119995da4768e931086592
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Eliminate injection of AAAShiroProvider"
Ryan Goulding [Fri, 16 Mar 2018 15:15:55 +0000 (15:15 +0000)]
Merge "Eliminate injection of AAAShiroProvider"

6 years agoMerge "New shiro EnvironmentLoaderListener"
Ryan Goulding [Fri, 16 Mar 2018 15:02:53 +0000 (15:02 +0000)]
Merge "New shiro EnvironmentLoaderListener"

6 years agoEliminate injection of AAAShiroProvider 39/69539/2
Tom Pantelis [Thu, 15 Mar 2018 18:36:25 +0000 (14:36 -0400)]
Eliminate injection of AAAShiroProvider

AAAShiroProvider is used as a holder for some instances and is injected
into other components just to access those instances. It's better to
directly inject the instances instead of having a dependency on
AAAShiroProvider.

Change-Id: Iaed51ae360360b3460c419eb4be2d4ffe3fdf558
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoNew shiro EnvironmentLoaderListener 35/69535/4
Tom Pantelis [Thu, 15 Mar 2018 16:40:17 +0000 (12:40 -0400)]
New shiro EnvironmentLoaderListener

Added ShiroWebEnvironmentLoaderListener and AAAIniWebEnvironment
that inject the required instances instead of obtaining statically.

Change-Id: I5979342b7463a3634e9208eb813f32174c2a4cb4
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agomake PaxWebServer ServiceFactory fail instead of return bogus WebServer 97/69497/3
Michael Vorburger [Wed, 14 Mar 2018 11:04:14 +0000 (12:04 +0100)]
make PaxWebServer ServiceFactory fail instead of return bogus WebServer

The current implementation may return a bogus defunct noop WebServer
which just ignores Servlet & Filter registrations (and just logs a WARN,
which could easily be overlooked) in case it cannot find the Pax Web
WebContainer service.

This change makes it instead "fail fast" on the WebServer service look
up.  Note that the ServiceFactory doc explicitly allows throwing
exceptions; that will be caught and turn into a null service reference,
which whatever is trying to obtain the WebServer must gracefully handle.

Change-Id: Ie4fcbdb125095d353d466958fade98fc759aefd4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoRefactor AAAShiroProvider & Co. to be non static 15/69415/6
Michael Vorburger [Mon, 12 Mar 2018 22:56:39 +0000 (23:56 +0100)]
Refactor AAAShiroProvider & Co. to be non static

- The IdmLightApplication is now instantiated and injected
  with the AAAShiroProvider and passed to the ServletContainer
  instead of the ServletContainer instantiating it via reflection.

- For KarafIniWebEnvironmentLoaderListener and KarafIniWebEnvironment,
  the initial plan was to inject the AAAShiroProvider however there
  are still web.xml files in ODL land that reference
  KarafIniWebEnvironment and expect a no-arg ctor. We need to keep
  backwards compatibility for a while so I'll follow-up later
  to add a new KarafIniWebEnvironmentLoaderListener that is advertised
  as a service for programmtic use. KarafIniWebEnvironment was changed
  to obtain the ShiroConfiguration statically rather than the
  AAAShiroProvider.

- The shiro lib still instantiates the filter/realm etc instances via
  reflection. These are specified via String key/value pairs with class names
  in the Ini instance. Unfortunately I see no way around this. So
  to avoid having to pass our services, eg DataBroker, via statics,
  I opted to use ThreadLocals to inject indirectly. This is a bit
  ugly but works.

Change-Id: I8f5114802c76cbd2b4bfda69952df2b28557cf8d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agouse web-api as dependency instead of web-osgi-impl in aaa-shiro 96/69496/2
Michael Vorburger [Wed, 14 Mar 2018 10:48:50 +0000 (11:48 +0100)]
use web-api as dependency instead of web-osgi-impl in aaa-shiro

and amend @author in PaxWebServer for credit where credit is due

and some minor logging related clean up in PaxWebServer

Change-Id: Ibc4f4d8fd95f5d5693c11abcad4735af2c3e4d27
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoAAA-169: Advertise PaxWebServer as an OSGi service 75/69475/1
Tom Pantelis [Wed, 14 Mar 2018 02:59:26 +0000 (22:59 -0400)]
AAA-169: Advertise PaxWebServer as an OSGi service

The Pax Web WebContainer implementation registers a ServiceFactory and
uses the class loader of the bundle that obtains the OSGi service
reference. When PaxWebServer is advertised as a service, it causes a
ClassNotFoundEx when initializing shiro b/c it uses the TCCL that is
set by Pax Web obtained from the PaxWebServer's bundle. To alleviate this,
we can advertise a WebServer ServiceFactory so it use the caller's
bundle to get the WebContainer service.

Change-Id: I591c340ccb0551a8138d07ec79443bc648218baf
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoreplace AAA's web.xml with programmatic registration 40/68840/12
Michael Vorburger [Tue, 27 Feb 2018 20:34:07 +0000 (21:34 +0100)]
replace AAA's web.xml with programmatic registration

This is a first step with a like-for-like transformation;
future changes could go further; notably integrate it with
AAAShiroProvider which, strangely, had separate web registration
not using web.xml, and -likely- (TBC) replace the static
CompletableFuture "hoop" in AAAShiroProvider with normal DI.

Change-Id: I43c5fe90a087e2fbc68f779655c211253775c2db
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoadd web API implementation for OSGi environment, based on Pax Web 39/68839/12
Michael Vorburger [Tue, 27 Feb 2018 20:21:14 +0000 (21:21 +0100)]
add web API implementation for OSGi environment, based on Pax Web

usage of this in AAA can be seen in the next commit ("chained")

Change-Id: If298047e2b295ca88d0494dc9733e1d91ee44a12
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoadd new API for programmatic registration of web Servlet, Filter, etc. 33/68833/12
Michael Vorburger [Tue, 27 Feb 2018 18:43:56 +0000 (19:43 +0100)]
add new API for programmatic registration of web Servlet, Filter, etc.

implementation & usage of this can be seen in the next "chained" commits

The purpose of this API is to let projects with web components, such as
neutron, aaa or restconf, ditch their respective web.xml.  This will have
a number of advantages, some of which are documented in the JavaDoc of
the new WebServer interface and WebContext class.

see also discussion and interest from project neutron re. adoption on:
https://lists.opendaylight.org/pipermail/neutron-dev/2018-February/001587.html

This is the change originally raised in infrautils as
Ib2df87ca31a2bde547efbf73e0475a1cd64ea6ea, but now instead proposed
to aaa, as discussed during the Kernel Projects call on 2018/02/27.

Change-Id: Ib2fb02aa19e49aa482062f18ba84124a9a623364
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoAAA-168: Remove embedded h2 dependency 14/69214/2
Ryan Goulding [Wed, 7 Mar 2018 15:06:50 +0000 (10:06 -0500)]
AAA-168: Remove embedded h2 dependency

This was code inherited from a long time ago and punted around AAA
without any real cleanup.  I am not sure why the original authors
decided to embed the dependency rather than just import it, but this
causes several issues.  This patch removes the embedded h2 dependency
in favor of direct import.  While I recognize that other parts of
ImportPackage need to be cleaned, they will be done in a subsequent
patch since they are separate concepts than what is done here.
In other words, expect follow-ups to continuing cleaning.

aaa-cli-jar relied on aaa-shiro shading the com.h2database:h2 jar,
so I instead added it as a compile time dependency for the module
and extracted the appropriate files for the generated jar in the
maven-shade-plugin configuration.

Change-Id: I9267f1373ddc5b8af0304fd5719dcc96b8874c32
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-167: Refresh test cert 82/69082/1
Ryan Goulding [Mon, 5 Mar 2018 16:11:57 +0000 (11:11 -0500)]
AAA-167:  Refresh test cert

Test cert used in UT for AAA was expired causing failures.  For now,
a 10 year cert is added to unblock the release.  Later, the tests
will be refactored to generate the key on the fly.

Change-Id: Ic1da844b2ffa841691f61f82106f24e0cb27bafe
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-166 fix (attempt) 62/68962/1
Michael Vorburger [Thu, 1 Mar 2018 16:48:02 +0000 (17:48 +0100)]
AAA-166 fix (attempt)

Change-Id: Ib2217b035138d993a88b2bc279316fd14925ea73
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoBump versions by x.(y+1).z for next dev cycle 23/68723/1
Anil Belur [Mon, 26 Feb 2018 07:41:40 +0000 (17:41 +1000)]
Bump versions by x.(y+1).z for next dev cycle

Change-Id: I135cb265c0a637da0b34907025ede4f686c9bcc3
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
6 years agoMerge "AAA-163: implement isEnabled flag in user model"
Ryan Goulding [Fri, 16 Feb 2018 19:01:50 +0000 (19:01 +0000)]
Merge "AAA-163: implement isEnabled flag in user model"

6 years agoAAA-163: implement isEnabled flag in user model 56/68156/4
Ryan Goulding [Mon, 12 Feb 2018 16:19:06 +0000 (11:19 -0500)]
AAA-163: implement isEnabled flag in user model

Make it possible to utilize "isEnabled" for users.  This has been
broken since inception since the folks submitted the code back in
2014, and was recently caught.  Basically, it was not implemented
period in the user lookup logic.

Additionally, changes were needed to the "User" API-- Jaxb
serialization was never working.  That is, the original authors
decided to use an "int" to represent enabled in H2, yet, tried to
map to a Boolean in the serdes process.  This means that calls to
User.isEnabled() always returned null, which is VERY bad practice.

The public methods were left in place, some wrappers were added, and
the internal implementation was changed to utilize an int for
User.enabled field, but still provide boolean the User.isEnabled()
predicate.

Change-Id: I92aa981035d91ca6ee1836d00546b446c7dc9738
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Eliminate infinite busy wait in KarafIniWebEnvironment"
Ryan Goulding [Thu, 15 Feb 2018 15:36:18 +0000 (15:36 +0000)]
Merge "Eliminate infinite busy wait in KarafIniWebEnvironment"

6 years agoEliminate infinite busy wait in KarafIniWebEnvironment 25/68225/3
Tom Pantelis [Wed, 14 Feb 2018 01:01:13 +0000 (20:01 -0500)]
Eliminate infinite busy wait in KarafIniWebEnvironment

We've seen SFT's hang on shut down due to the busy wait if the
blueprint container for aaa-shiro fails or is destroyed while
being created. The busy wait blocks startup of the web app and also
blocks on shut down causing the hang. To alleviate this, use a
Future to obtain the AAAShiroProvider. Also added a BundleActivator
to register a blueprint event listener that fails the Future
exceptionally when the blueprint container is destroyed.

Change-Id: I9198579aa026ab685af73ee624c353d7097ba86e
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoAAA-165: Add explicit import apache.commons.text 06/68206/1
Jamo Luhrsen [Sat, 10 Feb 2018 04:30:49 +0000 (20:30 -0800)]
AAA-165: Add explicit import apache.commons.text

- added a simple UT for domain delete, but even that UT
  would not fail for AAA-165

- moved from commons-lang3 to commons-text as I noticed
  StringEscapeUtils is deprecated in lang3 and text was
  what should be used

Change-Id: I0e8a5067666d062e2f119ddaa7511f0cc3a2dda1
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
6 years agoAAA-134: Cannot update domain name 63/68063/3
Ryan Goulding [Thu, 8 Feb 2018 15:00:40 +0000 (10:00 -0500)]
AAA-134:  Cannot update domain name

Modified the update SQL statement to include name.

Change-Id: I8fce9cbbf403fcc627b927e5750750de4d04403c
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "AAA-147: Jolokia Credentials are backed by AAA"
Ryan Goulding [Fri, 9 Feb 2018 13:43:58 +0000 (13:43 +0000)]
Merge "AAA-147: Jolokia Credentials are backed by AAA"

6 years agoMerge "Move AAAShiroProvider class in act into separate package"
Ryan Goulding [Fri, 9 Feb 2018 13:43:16 +0000 (13:43 +0000)]
Merge "Move AAAShiroProvider class in act into separate package"

6 years agoAAA-147: Jolokia Credentials are backed by AAA 70/68070/2
Ryan Goulding [Thu, 8 Feb 2018 19:02:59 +0000 (14:02 -0500)]
AAA-147: Jolokia Credentials are backed by AAA

Inject an Authenticator implementation into the service registry
for use with odl-jolokia from controller.  Corresponding patch:

https://git.opendaylight.org/gerrit/68069

W/o this Authenticator installed, jolokia authentication fails.

Change-Id: I8141336453f04052b617f322c94d6add8a37fcf5
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMove AAAShiroProvider class in act into separate package 93/68093/1
Michael Vorburger [Thu, 8 Feb 2018 17:16:14 +0000 (18:16 +0100)]
Move AAAShiroProvider class in act into separate package

There are two classes named AAAShiroProvider both in package
org.opendaylight.aaa; one in artifact (and OSGi bundle) aaa-shiro and
another one in aaa-shiro-act.

As far as I understand the AAA code, this does not seem to be done
intentionally for any particular reason, probably just historical
copy/paste.

Under OSGi, this doesn't really cause any major issues (other than it
being "really not nice", possibly confusing, and theoretically causing
issues if one were to use package import), as the two AAAShiroProvider
are loaded into separate ClassLoaders in their respective bundles.

When attempting to use AAA in a (non-OSGi) flat classpath environment
however, then the present situation, leads to this error:

[main] ERROR org.apache.shiro.web.env.EnvironmentLoader - Shiro
environment initialization failed
java.lang.NoSuchMethodError:
org.opendaylight.aaa.AAAShiroProvider.getInstance()Lorg/opendaylight/aaa/AAAShiroProvider;
at org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment.init(KarafIniWebEnvironment.java:67)

This change fixes above, for non-OSGi test envs, but seems a reasonable
clean up if for the standard deployment model of running ODL in OSGi.

Change-Id: Ia5d34e6f3ecf9d6539bdac9537b8628dcde59049
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoClean up artifacts 19/67719/3
Stephen Kitt [Tue, 30 Jan 2018 12:32:40 +0000 (13:32 +0100)]
Clean up artifacts

This removes a number of obsolete artifacts from aaa-artifacts, adds
some new ones, and adds a new module to verify that listed artifacts
are actually available.

Change-Id: I2ab9600a5ffb1b99c1dee00b0b6ac456cae49f57
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoAAA-158: remove exception output in HTTP response 34/68034/1
Ryan Goulding [Wed, 7 Feb 2018 19:11:37 +0000 (14:11 -0500)]
AAA-158: remove exception output in HTTP response

Change-Id: Icb3c2cfcf1d546bb365fb61d558cd3be428e5a15
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix README refactor 33/68033/1
Ryan Goulding [Wed, 7 Feb 2018 18:31:16 +0000 (13:31 -0500)]
Fix README refactor

During the refactor that eliminated "impl" from the packaging
structure, this README was not correctly updated.

Change-Id: Ib367cb3410513a3477a4dbe75fa1a8468ffa0d76
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-160: Fix aaa-cli commands 24/67624/2
serngawy [Fri, 26 Jan 2018 18:24:42 +0000 (13:24 -0500)]
AAA-160: Fix aaa-cli commands

Adding final to the command line variable make the variable
finally initalized and not re-assign value at runtime.

Access the datastore using AaaShiroProvider and delete the
old datastore service.

Change-Id: I8c2f7d39bd5e9be5349a2b922bb8afdbbb0b15a3
Signed-off-by: serngawy <m.elserngawy@gmail.com>
6 years agoMerge "AAA-159: Switch to using gson for JSON serialization"
Ryan Goulding [Tue, 6 Feb 2018 21:44:35 +0000 (21:44 +0000)]
Merge "AAA-159: Switch to using gson for JSON serialization"

6 years agoAAA-159: Switch to using gson for JSON serialization 89/67589/4
Ryan Goulding [Thu, 25 Jan 2018 21:45:16 +0000 (21:45 +0000)]
AAA-159: Switch to using gson for JSON serialization

Due to jackson incompatibility issues with other web env
elements (namely jax-rs), this change switches the serdes
for AAA endpoints to gson.  The motivation is two fold:

1) fix the immediate issue with the rest endpoints
2) align on a common JSON serdes framework in ODL

Since yangtools and others already utilize gson, and gson
seems to be a lot more friendly from a provider stand-
point, this change is the best solution to the given bug.

This patch does not completely remove jackson, since RESTCONF
depends on us bringing it in.  This will be another multi-
step process:

1) this patch
2) convert restconf to GSON or just add the jackson deps
   there (features/odl-aaa-shiro/pom.xml changes in last
   patch)
3) remove jackson dependencies from AAA

Change-Id: Id969ab11282513fc314b98cd2a3487327250113f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoODLPARENT-139: re-use caches when restarting 66/67966/1
Stephen Kitt [Tue, 6 Feb 2018 15:46:51 +0000 (16:46 +0100)]
ODLPARENT-139: re-use caches when restarting

When the Shiro bundles restart, for whatever reason, they always
attempt to re-create their caches; that fails because the caches are
still present. This patch re-uses existing cache managers and caches
when possible.

This doesn’t entirely resolve the SSH issues reported in
ODLPARENT-139, but it helps the SSH connection survive longer (which
makes it easier to debug).

Change-Id: I27944a87cfbd78b385274dee0c7c17b9aac4dd58
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoNETCONF-502: Provide GsonProvider for JSON serdes 92/67692/1
Ryan Goulding [Mon, 29 Jan 2018 20:38:41 +0000 (15:38 -0500)]
NETCONF-502:  Provide GsonProvider for JSON serdes

Just provide the GsonProvider for downstream consumption.
Transitioning AAA to this provider will happen in a later
patch in order to avoid breaking downstreams in the
meantime.

Change-Id: I1b129bae712446678546daaf77ea23cccd1bdd1e
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix packaging for shiro bundle 87/67687/1
Ryan Goulding [Thu, 25 Jan 2018 14:50:23 +0000 (09:50 -0500)]
Fix packaging for shiro bundle

Align packages to keep IDEs from barfing.

Change-Id: Ifdaa0a25dbf3d56860ca35f630554cc9a5285fd7
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRevert "Switch to using gson for JSON serialization" 86/67586/1
Ryan Goulding [Thu, 25 Jan 2018 19:52:03 +0000 (14:52 -0500)]
Revert "Switch to using gson for JSON serialization"

Temporary revert to unblock the broken distribution until the NETCONF
team responds to the actual fix.

Change-Id: Ic8a446c33b3ee2cc1a994bcb8fab77bd486a8c15
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMove AAAShiroProvider back 84/67584/1
Ryan Goulding [Thu, 25 Jan 2018 17:33:23 +0000 (12:33 -0500)]
Move AAAShiroProvider back

Caused some strange blueprint issues in dist-check.

Change-Id: I9d66e7e8ecbc87b549823fce852aac29a305bf8f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoSwitch to using gson for JSON serialization 56/66056/8
Robert Varga [Wed, 29 Nov 2017 11:42:50 +0000 (12:42 +0100)]
Switch to using gson for JSON serialization

This patch changes JSON provider to GSON, skipping jackson
packaging completely.  GSON is used by many upstream ODL
projects and is the desired single JSON library for the
future.

Some unit tests surrounding Handlers needed to be ignored
temporarily due to classpath issues;  some of the overlapping
technology is tested in integration-test so the AAA team
feels it is okay to temporarily disable for now.

For now, this change exposes a provider package for the
GsonProvider so that other projects running into the same
issue can utilize it without copying and pasting code.
Later, it will be moved somewhere more intelligent.

Change-Id: I6033980d0fdaa31be32e2e77a0b9f869a755246b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix packaging for shiro bundle 73/67573/1
Ryan Goulding [Thu, 25 Jan 2018 14:50:23 +0000 (09:50 -0500)]
Fix packaging for shiro bundle

Align packages to keep IDEs from barfing.

Change-Id: Ie037a1b2f1768840861bdc43a466b65aa8f014d7
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoDrop explicit jetty-servlets dependency 57/67357/2
Stephen Kitt [Fri, 19 Jan 2018 16:36:43 +0000 (17:36 +0100)]
Drop explicit jetty-servlets dependency

odl-feat-karaf-jetty ends up pulling in jetty-servlets, so there’s no
need to depend on it explicitly here. Getting it via the odlparent
feature ensures that our runtime is consistent.

Change-Id: I6c11f0eb9cafb0db815760fed0ae6c6a976d171a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoEliminate unnecessary explicit yangtools dependencies 48/67348/1
Tom Pantelis [Fri, 19 Jan 2018 13:56:13 +0000 (08:56 -0500)]
Eliminate unnecessary explicit yangtools dependencies

Changed the parent pom to derive from bindng-parent so
yangtools version and dependencies comes from mdsal.

Change-Id: Id10a9d47abdda3a586af3707d7553f74382c566b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoBump to yangtools-2.0.1 58/67258/2
Robert Varga [Wed, 17 Jan 2018 23:38:16 +0000 (00:38 +0100)]
Bump to yangtools-2.0.1

Adopt latest release for corrected SchemaContext behavior, forcing
downstreams to use those.

Change-Id: Ibe596ef486d11da4c06e1f250005e6f4ea995573
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Rely on mdsal for yangtools features"
Ryan Goulding [Thu, 18 Jan 2018 13:40:34 +0000 (13:40 +0000)]
Merge "Rely on mdsal for yangtools features"

6 years agoEliminate yangtools.version 57/67257/1
Robert Varga [Wed, 17 Jan 2018 23:37:01 +0000 (00:37 +0100)]
Eliminate yangtools.version

Versions should be pushed via artifact imports, not via properties.

Change-Id: I9b59e4ef5a56a46939d3254327cd43baf16dba8a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoRely on mdsal for yangtools features 40/67240/1
Stephen Kitt [Wed, 17 Jan 2018 15:27:57 +0000 (16:27 +0100)]
Rely on mdsal for yangtools features

Instead of explicitly listing yangtools features, rely on mdsal
providing them for us. This simplifies yangtools version bumps.

Change-Id: I4e9fd3b0a593d96e41dcd3fac22392db77dd633f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoBump to yangtools-2.0.0 and odlparent-3.0.2 96/64196/23
Robert Varga [Thu, 12 Oct 2017 11:33:08 +0000 (13:33 +0200)]
Bump to yangtools-2.0.0 and odlparent-3.0.2

Adopt yangtools-2.0.0 and odlparent-3.0.2, adjusting feature
references. Since we are bumping to karaf-4.1.x, we also need
to bump sshd references.

Change-Id: I31aed1ebb96ad7cf3f0cdd131a25515dc77e3dbe
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Revert "Moon Authorization Driver for ODL/AAA""
Ryan Goulding [Thu, 11 Jan 2018 15:01:00 +0000 (15:01 +0000)]
Merge "Revert "Moon Authorization Driver for ODL/AAA""

6 years agoRevert "Moon Authorization Driver for ODL/AAA" 63/67063/1
Ryan Goulding [Thu, 11 Jan 2018 14:20:46 +0000 (14:20 +0000)]
Revert "Moon Authorization Driver for ODL/AAA"

This reverts commit 6ccfaeb9fcaacdf0edc94a7383ccc2e71a32738f.

Change-Id: I88ba0e0f3862cb751105569aa81c8d88e71fcf8a
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Temp. Remove MDSAL from aaa-app-config"
Ryan Goulding [Mon, 8 Jan 2018 21:08:17 +0000 (21:08 +0000)]
Merge "Temp. Remove MDSAL from aaa-app-config"

6 years agoTemp. Remove MDSAL from aaa-app-config 53/66953/1
Ryan Goulding [Mon, 8 Jan 2018 20:02:11 +0000 (15:02 -0500)]
Temp. Remove MDSAL from aaa-app-config

Per AAA meeting discussions, it is probably better to delegate
Token Processing to the MdsalRealm or a corresponding pre-filter.
This has been done in the past for things like OAuth2 Token
processing.  This change purely removes the option for MDSAL
backed store from the aaa-app-config, since the existing impl is
provided separately through MdsalRealm.  Right now, choosing
MDSAL as an option actually only instantiates skeleton code, so it
is better to leave this option out in this release for
security purposes.

Change-Id: Ia32809f02865af8f96e0bdacbd20d064055114fe
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-155: don't force non-null input on currentUser cache lookup 45/66945/2
Evan Zeller [Fri, 5 Jan 2018 23:19:17 +0000 (15:19 -0800)]
AAA-155: don't force non-null input on currentUser cache lookup

On the first CLI command issued no auth users are cached in either the
SessionsManager cache nor AaaCliAbstractCommand's static authUser. We
must take input from the user and do the lookup in the identity store.
Subsequent commands will use the now cached user until the entry is
evicted. getCurrentUser should handle the null input and be explicit
about the nullability of its return value.

Change-Id: I18291e25723f428d2e27f79184d957f7715357f8
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>
6 years agoRemove shiro.ini conversion script 49/66949/1
Ryan Goulding [Mon, 8 Jan 2018 17:18:17 +0000 (12:18 -0500)]
Remove shiro.ini conversion script

shiro.ini was done away with many releases ago.  As part
of its removal, the AAA team added a conversion script to
convert the shiro.ini file into a format that could be
recognized by the aaa clustered-app-config.  Since the
shiro.ini based approach has been gone for over a release,
this patch removes the conversion script since it should
no longer be needed.

Change-Id: I6866ae1faea0362251ff26fabc8f6df360acde08
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMoon Authorization Driver for ODL/AAA 15/66615/6
YuchenWang [Tue, 19 Dec 2017 14:05:45 +0000 (22:05 +0800)]
Moon Authorization Driver for ODL/AAA

https://github.com/WangYuchenSJTU/ODL-Moon-Authz

Change-Id: I7cc569561c7dd3cee26985b11c27ba9dbf913642
Signed-off-by: YuchenWang <lucassjtu@gmail.com>
6 years agoMerge "AAA-154 Make H2 database credentials configurable"
Ryan Goulding [Fri, 1 Dec 2017 19:44:10 +0000 (19:44 +0000)]
Merge "AAA-154 Make H2 database credentials configurable"

6 years agoCollapse features into features-aaa repository 16/66016/3
Ryan Goulding [Tue, 28 Nov 2017 17:59:59 +0000 (12:59 -0500)]
Collapse features into features-aaa repository

Instead of providing two of essentially the same repository,
instead just provide one called features-aaa.

Change-Id: Ic60fca3a2b3129fe424e353ea1a1e074927f0a98
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Clear claim cache when grants/roles/domains change"
Ryan Goulding [Wed, 29 Nov 2017 14:02:31 +0000 (14:02 +0000)]
Merge "Clear claim cache when grants/roles/domains change"

6 years agoMerge "Use gson to parse JSON output"
Ryan Goulding [Wed, 29 Nov 2017 13:57:21 +0000 (13:57 +0000)]
Merge "Use gson to parse JSON output"

6 years agoUse gson to parse JSON output 55/66055/1
Robert Varga [Wed, 29 Nov 2017 11:01:33 +0000 (12:01 +0100)]
Use gson to parse JSON output

org.json is poorly maintained and licensed piece of software,
which is causing us headaches whenever encountered. Remove its use
and use GSON to parse JSON payloads.

Change-Id: I07a7cc486b88e949b23b1d8714163eabea116b92
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoClear claim cache when grants/roles/domains change 36/66036/1
Ryan Goulding [Tue, 28 Nov 2017 22:00:19 +0000 (17:00 -0500)]
Clear claim cache when grants/roles/domains change

The claim cache should be cleared whenever a change
occurs to these entitites.

Change-Id: Iadfc71e219847609147b64394fd3b549c7979342
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-154 Make H2 database credentials configurable 33/66033/1
Ryan Goulding [Tue, 28 Nov 2017 21:33:04 +0000 (16:33 -0500)]
AAA-154 Make H2 database credentials configurable

Makes the credentials for H2 file-oriented database
configurable.  These aren't AAA credentials, but rather
the credentials to the underlying data store.

Change-Id: I5e511a172155e355e3f88f2145f7ef95b4896eb7
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Fix stale javadoc in StoreBuilder"
Ryan Goulding [Tue, 28 Nov 2017 19:41:31 +0000 (19:41 +0000)]
Merge "Fix stale javadoc in StoreBuilder"

6 years agoFix stale javadoc in StoreBuilder 20/66020/1
Ryan Goulding [Tue, 28 Nov 2017 18:51:34 +0000 (13:51 -0500)]
Fix stale javadoc in StoreBuilder

Probably a rebase issue, but the javadoc has two @return
annotations.  This deletes the stale/irrelevant one.

Change-Id: I302dbc5b601ad52897b03c3b15583b0ebe8caf6f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-153 remove "user" OOB account 17/66017/1
Ryan Goulding [Tue, 28 Nov 2017 18:40:58 +0000 (13:40 -0500)]
AAA-153 remove "user" OOB account

Limit exposure by just providing "admin" account OOB.

Change-Id: I451d84e06a208e5b9701fe461b5b46ef47fcbcdd
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "AAA-151: Invalidate claim cache for CLI initiated changes"
Ryan Goulding [Tue, 28 Nov 2017 17:20:31 +0000 (17:20 +0000)]
Merge "AAA-151:  Invalidate claim cache for CLI initiated changes"

6 years agoMerge "MdsalRealm enable/disable user"
Ryan Goulding [Tue, 28 Nov 2017 16:38:19 +0000 (16:38 +0000)]
Merge "MdsalRealm enable/disable user"

6 years agoAAA-151: Invalidate claim cache for CLI initiated changes 15/65815/5
Ryan Goulding [Tue, 21 Nov 2017 18:46:34 +0000 (13:46 -0500)]
AAA-151:  Invalidate claim cache for CLI initiated changes

The AAA IDM REST handlers already invoke the clearing of the
IdmLightProxy claimCache upon user update, but the CLI Handler did
not handle this properly.  This change manually invokes the claim
invalidation.

Access to AAA CLI commands requires access to the karaf console via
client or SSH.  Thus, system level access is needed to some degree
to invoke such commands.  The major threat involves the action of
an administrator changing a user password via CLI, and then still
being able to invoke the old password because the claimCache is not
purged.  This is why a reboot of karaf solves this issue;  the
claimCache is flushed.  We should not expect our users/administrators
to assume this in the future;  this change explicitly invokes
the claimCache flush.

AAA-151 affects Carbon, Nitrogen, and master.

Change-Id: Ie3101d4dc2bbb6d0db91ddad4d567a41d041150d
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMdsalRealm enable/disable user 82/65682/2
Ryan Goulding [Fri, 17 Nov 2017 19:38:21 +0000 (14:38 -0500)]
MdsalRealm enable/disable user

This was built into the original IdM data model for the H2 store,
and thus was cascaded to the Mdsal model for backwards compatibility
purposes mostly.  The original model didn't do anything with this
field;  this one now properly honors the "enabled" field.

Change-Id: I4f15c45a336008c66423ef438c141cf6df132583
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Dissuade use of author name in source"
Ryan Goulding [Tue, 21 Nov 2017 15:29:05 +0000 (15:29 +0000)]
Merge "Dissuade use of author name in source"

6 years agoMerge "Add MdsalRealm information to README.md"
Ryan Goulding [Tue, 21 Nov 2017 14:50:30 +0000 (14:50 +0000)]
Merge "Add MdsalRealm information to README.md"

6 years agoDissuade use of author name in source 16/65116/5
Ryan Goulding [Fri, 3 Nov 2017 17:34:40 +0000 (13:34 -0400)]
Dissuade use of author name in source

This is just an attempt to make the code more community centric.
I don't care if other contributors want to keep their "@author"
annotation tags-- but I do want to spread the love in terms of
support queries etc :).

This removes my name/email anywhere possible in an effort to
make the aaa codebase more community centric.  I still plan to
be active, I just would rather people email the aaa reflector:

aaa-dev@lists.opendaylight.org

rather than unicast my email address.

Whenever I saw trivial changes like unused import or whatnot,
I just removed them to make the code cleaner.

Change-Id: I56573bf618deac22c41a2276233ed9d6c00c07de
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix odlparent-3.0.0 checkstyle violations 54/65754/1
Robert Varga [Mon, 20 Nov 2017 18:30:34 +0000 (19:30 +0100)]
Fix odlparent-3.0.0 checkstyle violations

There are new violations reported:
- hidden fields
- utility classes with public constructor

Change-Id: Iced411566cc5e1d8c5d69554222db0d53bedee3f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoRemove duplicate dependency declarations 53/65753/1
Robert Varga [Mon, 20 Nov 2017 18:34:39 +0000 (19:34 +0100)]
Remove duplicate dependency declarations

This fixes maven warnings related to duplicates being declared.

Change-Id: I9b2c905b893de73466bd7f2012b1e53fb0ba236f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoAdd MdsalRealm information to README.md 81/65681/1
Ryan Goulding [Fri, 17 Nov 2017 19:27:34 +0000 (14:27 -0500)]
Add MdsalRealm information to README.md

Add caveats about the new MdsalRealm to the AAA README.  Point
out the current state and the future work involved to get
MdsalRealm in production shape.

Change-Id: I55016467e37f00c14d4ade2b8c113032c6c9a6a8
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agomdsalrealm based on shiro 08/65508/7
Ryan Goulding [Tue, 14 Nov 2017 16:49:17 +0000 (11:49 -0500)]
mdsalrealm based on shiro

Adds basic support for MdsalRealm, a realm which authenticates
using information from the "authentication" container in the
"aaa.yang" model.  MdsalRealm still isn't enabled OOB.

aaa endpoints are protected by allowing access to admin role only.

Change-Id: I3a6423e28c0e14764d172698aa4d67d0ec472379
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "AAA-149: migrate ServiceProxy to the correct package name"
Mohamed El-Serngawy [Fri, 17 Nov 2017 14:15:56 +0000 (14:15 +0000)]
Merge "AAA-149: migrate ServiceProxy to the correct package name"

6 years agoMerge "Rid AAA source of binary images"
Mohamed El-Serngawy [Fri, 17 Nov 2017 14:15:28 +0000 (14:15 +0000)]
Merge "Rid AAA source of binary images"

6 years agoCollapse aaa feature repositories 35/65635/1
Ryan Goulding [Thu, 16 Nov 2017 19:46:22 +0000 (14:46 -0500)]
Collapse aaa feature repositories

AAA advertises two feature repositories.  Historically, this was done based
on the fact that it was hoped to pull out a ton of the stuff surrounding
non-shiro implementation in downstream distributions by just discluding the
non-shiro feature repository.  However, it appears that this has limited use,
and primarily serves as a distraction.  Furthermore, there are more
intelligent ways to perform such an operation.

The first part of this change renames the "authn" module to "aaa", because
the contained features repository is "features-aaa" and is not specific
to authentication.

The second part moves odl-aaa-shiro to the aaa module.  This is done in
preparation to remove features-aaa-shiro, which will no longer be offered.

features-aaa-shiro still contains the odl-aaa-shiro feature for now.
After all downstreams are migrated to utilize features-aaa instead, it
will be completely removed as a module.  This is a multistep process and
should not affect downstream consumers.

Change-Id: Ie084b622b1e58c661fee910e85a204436bf23f3e
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAAA-149: migrate ServiceProxy to the correct package name 21/65621/2
Ryan Goulding [Thu, 16 Nov 2017 14:26:59 +0000 (09:26 -0500)]
AAA-149: migrate ServiceProxy to the correct package name

This migrates ServiceProxy to the correct package.  AAA-149 is
being done in several small steps in order to ensure that the
changes do not affect downstream consumers.  This change was
tested against NETCONF to ensure there was no downstream
breakages (which makes sense since NETCONF does not directly
manipulate ServiceProxy and actually only affects it through
AAA code).

Change-Id: If142f4fe1ddc91cf844fb8d0ca3a6496f0828efd
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRid AAA source of binary images 28/65628/1
Ryan Goulding [Thu, 16 Nov 2017 18:22:39 +0000 (13:22 -0500)]
Rid AAA source of binary images

From long ago we referenced some images in our README.md and directly
stored them in source.  Thats a bad idea for a number of reasons.  This
simply gets rid of the references to the one remaining image and the
source/output graphics that were stored in source.  If we want them back,
we can figure out a way to upload them to somewhere more appropriate.

The one existing accurate diagram, direct_authn.png, was really simple
to understand anyway.  If we want, we can restore it somewhere new,
put it in ascii-art, or just describe it better.  Also, it is probably
better to consolidate that sort of information in the docs project.

Change-Id: I104c32eb844cf4031f26f6108aeb8b98d13b9401
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "AAA-149 migrate Handler classes to correct package"
Mohamed El-Serngawy [Thu, 16 Nov 2017 15:30:25 +0000 (15:30 +0000)]
Merge "AAA-149 migrate Handler classes to correct package"

6 years agoMerge "Remove unused graphics"
Mohamed El-Serngawy [Thu, 16 Nov 2017 15:26:59 +0000 (15:26 +0000)]
Merge "Remove unused graphics"

6 years agoMerge "Fix compile time warnings in aaa-shiro-act"
Mohamed El-Serngawy [Thu, 16 Nov 2017 15:26:20 +0000 (15:26 +0000)]
Merge "Fix compile time warnings in aaa-shiro-act"

6 years agoAAA-149 migrate Handler classes to correct package 15/65615/1
Ryan Goulding [Thu, 16 Nov 2017 13:32:34 +0000 (08:32 -0500)]
AAA-149 migrate Handler classes to correct package

Migrate the *Handler classes to the right package, along with
the corresponding tests.

Change-Id: I1e01f4bfec298fb81376a8ea9f8bc8927c44f4b1
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix compile time warnings in aaa-shiro-act 55/65555/1
Ryan Goulding [Wed, 15 Nov 2017 15:56:49 +0000 (10:56 -0500)]
Fix compile time warnings in aaa-shiro-act

The init/close methods in the Provider for aaa-shiro-act are called via
blueprint, but IntelliJ and other IDEs do not recognize our custom blueprint
path (src/main/resources/org/opendaylight/blueprint).  Thus, we get a ton
of annoying warnings about unused init/close methods.  This fixes the issue
for aaa-shiro-act.

Change-Id: Iefd1aa44bf85c9e073d080c9293c325da82b3c33
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix weird formatting in blueprint.xml file 54/65554/1
Ryan Goulding [Wed, 15 Nov 2017 15:52:46 +0000 (10:52 -0500)]
Fix weird formatting in blueprint.xml file

aaa-shiro-act had an empty bean definition so I fixed the notation to use
self-enclosed xml.  This is just cleaner and was really bothering me :).

Change-Id: I8a08ffbb338f935e6db0800a05bc8867b789f090
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRemove unused graphics 53/65553/1
Ryan Goulding [Wed, 15 Nov 2017 15:47:21 +0000 (10:47 -0500)]
Remove unused graphics

Previously referenced in the README, but now are no longer applicable.
These graphics depicted sssd plugin which was removed many releases ago.
Furthermore, graphics really don't belong in source (i.e., git).

Change-Id: If78bc55f6ee6b42e6abb28df356baa9aeda122f6
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRefactor AAA datastore & add datastore change functionality 63/63863/9
Mohamed ElSerngawy [Sun, 1 Oct 2017 20:17:37 +0000 (16:17 -0400)]
Refactor AAA datastore & add datastore change functionality

Moving h2 store bundle to aaa-shiro bundle and
add the option to switch between data stores

Change-Id: I4a3ce831eecae4c1382852fc004149da3abe6d57
Signed-off-by: Mohamed ElSerngawy <m.elserngawy@gmail.com>
6 years agoRemove stale documentation 30/65230/1
Ryan Goulding [Mon, 6 Nov 2017 20:33:25 +0000 (15:33 -0500)]
Remove stale documentation

README.md contained some references to installing the filter as
a ContainerRequestFilter.  Now, we actually use a regular
javax.servlet.Filter, so this documentation is out of date.
This patch just removes the stale documentation.

Change-Id: I7a5183f7db0c77e2012c03e754e7428ebab69098
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Revert "Remove felix.dm usage in aaa-filterchain""
Ryan Goulding [Mon, 6 Nov 2017 20:17:03 +0000 (20:17 +0000)]
Merge "Revert "Remove felix.dm usage in aaa-filterchain""

6 years agoMerge "Revert "Remove felix.dependencymanager from Shiro POM""
Ryan Goulding [Mon, 6 Nov 2017 20:16:53 +0000 (20:16 +0000)]
Merge "Revert "Remove felix.dependencymanager from Shiro POM""

6 years agoMerge "Revert "Remove un-used felix.dm usage from aaa-encrypt-service""
Ryan Goulding [Mon, 6 Nov 2017 20:16:43 +0000 (20:16 +0000)]
Merge "Revert "Remove un-used felix.dm usage from aaa-encrypt-service""

6 years agoMerge "Revert "Remove felix.dm from odl-aaa-shiro feature""
Ryan Goulding [Mon, 6 Nov 2017 20:16:32 +0000 (20:16 +0000)]
Merge "Revert "Remove felix.dm from odl-aaa-shiro feature""

6 years agoRevert "Remove felix.dm usage in aaa-filterchain" 29/65229/1
Ryan Goulding [Mon, 6 Nov 2017 20:16:11 +0000 (20:16 +0000)]
Revert "Remove felix.dm usage in aaa-filterchain"

This reverts commit 822554dcc7cfd59034622a0f41df5b25a2ae2520.

Change-Id: I0ea057fa13784849849020906c81add04cebad01
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRevert "Remove felix.dependencymanager from Shiro POM" 28/65228/1
Ryan Goulding [Mon, 6 Nov 2017 20:16:01 +0000 (20:16 +0000)]
Revert "Remove felix.dependencymanager from Shiro POM"

This reverts commit 8efc8bc00d2cfbd0d983bf36eec578cfddc60c9e.

Change-Id: I1ff4fef8f5c2fb3d1cf5d1e64a944c5c0f5a2f20
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRevert "Remove un-used felix.dm usage from aaa-encrypt-service" 27/65227/1
Ryan Goulding [Mon, 6 Nov 2017 20:15:47 +0000 (20:15 +0000)]
Revert "Remove un-used felix.dm usage from aaa-encrypt-service"

This reverts commit 38887453198b93327e7d298ad33dd697c4070b28.

Change-Id: Ic419b0e6f1913da2078799002e9df46b38e67b55
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoRevert "Remove felix.dm from odl-aaa-shiro feature" 26/65226/1
Ryan Goulding [Mon, 6 Nov 2017 20:09:42 +0000 (20:09 +0000)]
Revert "Remove felix.dm from odl-aaa-shiro feature"

This reverts commit fb462f2322b4156bb617ac041061612e50420020.

Change-Id: Id236b1ff1c8083e40700518b3255734c60ea4bab
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Remove un-used felix.dm usage from aaa-encrypt-service"
Ryan Goulding [Mon, 6 Nov 2017 19:37:00 +0000 (19:37 +0000)]
Merge "Remove un-used felix.dm usage from aaa-encrypt-service"

6 years agoMerge "Remove felix.dm usage in aaa-filterchain"
Ryan Goulding [Mon, 6 Nov 2017 19:36:47 +0000 (19:36 +0000)]
Merge "Remove felix.dm usage in aaa-filterchain"