Commit Graph

84 Commits

Author SHA1 Message Date
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
olivier lamy e1371a1c13 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Olivier Lamy fe3d3f7158
fix checkstyle in test sources (#4013)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
Jan Bartel cf4e7412d4
Issue #3815 Ensure user not in roles for PropertyFileLoginModule (#3826)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-01 15:46:14 +02:00
Greg Wilkins 9706d70484
Jetty 9.4.x reformat (#3811)
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
Joakim Erdfelt 63109108a8 Issue #3751 - Use Modern DTD/FPI consistently
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 07:21:59 -05:00
Joakim Erdfelt b44ecc932a Issue #2909 - Replace B64Code with java.util.Base64
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
  is possible without change in behavior. Just have to make
  sure you use the appropriate Encoder / Decoder for the task
  at hand (default vs mime vs url)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
Jan Bartel beb4881af4
Issue #3394 Remove unused JAASGroup,RoleCheckPolicy,StrictRoleCheckPolicy (#3433)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-08 10:44:39 +11:00
Ortwin Glück 1df8dfcc91 make JAASPrincipal thread-safe
It's immutable anyway, so declare its only instance var final.

Signed-off-by: Ortwin Glück <odi@odi.ch>
2019-01-18 14:52:34 +01:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Алексей Пастухов 04941fd44c Issue #2691 replace static dn by subtee based ldap lookup for an entry inside _userBaseDn (#2842)
* replace static dn by subtee based ldap lookup for an entry inside _userBaseDn
* additional ldap tests to cover enhancement of #2842

Signed-off-by: Alexei Pastuchov <alexei.pastuchov@telecolumbus.de>
2018-09-11 15:57:48 +10:00
olivier lamy 5910c064e8 remove unused import
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 12:05:32 +10:00
Olivier Lamy 2cbe395f29
Cleanup jaas ldaptest (#2881)
* reduce test verbosity

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* reduce verbosity of failed login

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* apply jan changes

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-06 08:05:47 +10:00
Joakim Erdfelt a3f1592c50 Issue #2431 - Upgrade to Junit 5 (#2436)
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
Olivier Lamy 9cb9be83fd Issue #2846 Jaas ldap unit test (#2864)
* #2846 add jaas ldap unit tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-30 14:17:08 +10:00
Sean Kavanagh 83b2abebb7 Added null check when adding credentials to Set (#2649)
Added null check when adding credentials to Set returned from getPrivateCredentials().  Fixes #2648

Signed-off-by: Sean Kavanagh <sean.p.kavanagh6@gmail.com>
2018-06-12 08:39:21 +10:00
Jan Bartel 44dfa868df
Issue #2445 Optionally expose request for jaas (#2463)
* Issue #2445 Optionally expose request for jaas

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-05-01 10:06:22 +10:00
Olivier Lamy f36eba4577
class.newInstance is deprecated #2435 (#2437)
* Class.newInstance() is deprecated in Java 9+ #2435

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
Jan Bartel 516f6d21c5
Issue #110 Avoid classloading for checking roles in jaas (#2381)
* Issue #110 Avoid classloading for checking roles in jaas

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-17 16:20:13 +10:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
olivier lamy 041a3260b6 more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 09:04:29 +11:00
olivier lamy b48364c298 more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 19:54:09 +11:00
Greg Wilkins bdc7242de6 reformatted code LdapLoginModule.java 2017-09-13 11:09:58 +10:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Joakim Erdfelt 167f6c8d23 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-19 16:17:25 -07:00
SimonDallaway 51567be439 fix for userRdnAttribute value != username
Signed-off-by: SimonDallaway <simon.dallaway@datacom.co.nz>
2016-10-14 13:20:04 +13:00
Jesse McConnell 847d377d32 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-03 17:00:46 -05:00
Jesse McConnell 4bf885cedd Issue #56 - address users issues with ldap login 2016-08-03 16:59:17 -05:00
Jesse McConnell d9d20670fb Resolve Issue #649 by checking for null password on a binding ldap authentication 2016-07-21 08:14:07 -07:00
Jesse McConnell c64e34c79f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-17 18:57:07 -05:00
Jesse McConnell 99e1a16d07 Resolve Issue #649 by checking for null password on a binding ldap authentication 2016-06-17 18:56:45 -05:00
Jan Bartel f4e91a5896 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-11 23:05:53 +11:00
JACQUES Francois 1f75ab178c Fetch user roles after a successful forced binded ldap login.
Signed-off-by: JACQUES Francois <fjacques@murex.com>
2016-02-25 10:35:53 +01:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Jan Bartel 81b2a6a4de 483059 Remove cache of authenticated users 2015-11-26 15:31:19 +11:00
Jan Bartel c7ab05a0b8 Refactor jaas login sequence to only fetch role data if user is authenticated according to that module. 2015-11-25 14:02:12 +11:00
Jan Bartel 6e37f4886a Refactor jaas login sequence to only fetch role data if user is authenticated according to that module. 2015-11-25 13:58:27 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
2015-11-19 12:14:05 +11:00