Skip to content

Fix resolution of Gitlab::AppLogger in EE kerberos_spnego_helper

Peter Leitzen requested to merge pl-fix-applogger-namespace-kerberos into master

What does this MR do?

Since EE::Gitlab is already defined we need to fully qualify ::Gitlab::AppLogger (non-EE) in EE modules.

This regression was introduced in %13.4 via !41048 (merged).

Reproduction from #263099 (closed):

irb(main):039:0> module EE
irb(main):040:1>   begin
irb(main):041:2>     raise 'This exception will be rescued!'
irb(main):042:2>   rescue StandardError => e
irb(main):043:2>     Gitlab::AppLogger.error "#{e.message}"
irb(main):044:2>   end
irb(main):045:1> end
Traceback (most recent call last):
        3: from (irb):39
        2: from (irb):40:in `<module:EE>'
        1: from (irb):43:in `rescue in <module:EE>'
NameError (uninitialized constant EE::Gitlab::AppLogger)
Did you mean?  Approver

Contributes to #263099 (closed)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by Peter Leitzen

Merge request reports