Skip to content

Commit

Permalink
Merge pull request #19 from PedroHenriqueDevBR/dev
Browse files Browse the repository at this point in the history
refact: removed unecessary lines
  • Loading branch information
PedroHenriqueDevBR authored Jun 29, 2023
2 parents c7fdfd8 + bf96093 commit 4d2b6c3
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 14 deletions.
16 changes: 3 additions & 13 deletions ldap_password/apps/core/services/ldap/change_password.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def _auth_service_ldap_user(self) -> None:
username = self.ldap_username
password = self.ldap_password
domain = self.ldap_logon_domain_name

if "@" in username or "\\" in username or "CN=" in username:
self.connection.user = username
else:
Expand All @@ -70,18 +71,7 @@ def _auth_service_ldap_user(self) -> None:
self.connection.user = f"{username}@{domain}"

self.connection.password = password
svc_account = self.ldap_username == username

if not self.connection.bind():
if svc_account:
print("error", "The service account failed to login")
return None
else:
print('The user "%s" failed to login', self.connection.user)
print("Username or password is incorrect. Please try again")
return None
print("error", "The service account failed to login")
else:
if svc_account:
print("The service account logged in successfully")
else:
print("The user logged in successfully")
print("The service account logged in successfully")
2 changes: 1 addition & 1 deletion ldap_password/apps/core/services/ldap/search_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def _get_connection(self):
host=self.ldap_url,
port=self.ldap_port,
get_info=ALL,
use_ssl=True if self.ldap_url == 636 else False,
use_ssl=True if self.ldap_port == 636 else False,
)
self.ldap = Connection(
ldap_server,
Expand Down
36 changes: 36 additions & 0 deletions ldap_password/dockerfiles/nginx/cert/ca.cer
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
-----BEGIN CERTIFICATE-----
MIIGTjCCBTagAwIBAgIRANPvZBwitKTBoAmwcADVkzEwDQYJKoZIhvcNAQELBQAw
gY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UE
AxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
QTAeFw0yMjEyMTIwMDAwMDBaFw0yNDAxMTEyMzU5NTlaMCExHzAdBgNVBAMMFiou
ZGVmZW5zb3JpYS5waS5kZWYuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQDF6JQLhdiddyiTcOfweBRehnetC9BTvWFlYcwnShi2pelyLs4+4FG8aWwP
0xlC6ivZf4T6q2z4//IPeiykzjl+ieb7omoDQjONsFXgoDbgTUtYJ+Hn4Mnmzqv8
Edq8Rh7IVOHoWhTpgWuZku3uGRjOlQbMwLNiUMpeEvepIoDSIC4zLzmHiUKC4ssd
YRr8tTE7Y2PL98S+34Kx6tOfPfrSMK2IBQ2AXhZhfwwHeNqki75LAuKGSFU5SmAT
ngduD0h35wdOiYVoErOXhcb0dtk/bnlj+yNrltDi9IjT80z04rh6Hk6Zg3sG74QP
qiVkEfqa2h8qLSUhDZVRdFAf6TgBAgMBAAGjggMQMIIDDDAfBgNVHSMEGDAWgBSN
jF7EVK2K4Xfpm/mbBeG4AY1h4TAdBgNVHQ4EFgQUHErDM1AAzHV+4T1bH0aKQTse
ZYIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
BQUHAwEGCCsGAQUFBwMCMEkGA1UdIARCMEAwNAYLKwYBBAGyMQECAgcwJTAjBggr
BgEFBQcCARYXaHR0cHM6Ly9zZWN0aWdvLmNvbS9DUFMwCAYGZ4EMAQIBMIGEBggr
BgEFBQcBAQR4MHYwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jcnQuc2VjdGlnby5jb20v
U2VjdGlnb1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwIwYI
KwYBBQUHMAGGF2h0dHA6Ly9vY3NwLnNlY3RpZ28uY29tMDcGA1UdEQQwMC6CFiou
ZGVmZW5zb3JpYS5waS5kZWYuYnKCFGRlZmVuc29yaWEucGkuZGVmLmJyMIIBgAYK
KwYBBAHWeQIEAgSCAXAEggFsAWoAdgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIK
n+ZnTFo6dAAAAYUH5c3wAAAEAwBHMEUCICqp1JCQ19YQ8r5i7Dr/CaRP4imle4UF
GIB//oI61oYsAiEAwEyLqctbzf/QV0sK6wuH1qE1h8E1HAPHXly/771UeiMAdwA7
U3d1Pi25gE6LMFsG/kA7Z9hPw/THvQANLXJv4frUFwAAAYUH5c3QAAAEAwBIMEYC
IQCCEOeJzupbc/iqWaEG9EtNyNeHu9Rq9cYzugaLskyo8gIhAKXZOMZaACaDNe4x
WjyKeRABaOi3dDVe2M9S7V6cf9ZIAHcA7s3QZNXbGs7FXLedtM0TojKHRny87N7D
UUhZRnEftZsAAAGFB+XN0wAABAMASDBGAiEA00yfZjC8412IhP4VCveaAz1OxZPT
hnGIIWgLAEerN6oCIQCd16x0dEAQ1E1AmWRQ05iXdlXYaFlFXBlNtwxL0r4mXjAN
BgkqhkiG9w0BAQsFAAOCAQEAKq7CYLNKQcJgKvOx5KO1knOJ2SFmdwUOD7VGSpyA
jon646y/4yjpd5zmhIxPMdm1C+iTLYYHpLz7mXHHHKFt8uG8HNFFVMObcFAOfB9y
wqQ7q832PeSOuqKG6Fal9MV4gb5Dee10ezQVLCebDpowjn+IrP6IqM+AfpCOUVli
yIsyJmXm31QDAjKnhRGBMOVqWm+67k1COcuczkbVgsAAZ05Wn7+LwJREjwkdQiFQ
lfL1l3uUxxcrMPuhgJZAGoEmj7KV8Vjnikp1bBKlWLwXoBHFv5YUen5lGU+Hg8p4
tEa7LW1SFPDLsXfnJzrd/tcjRiIJRMcyvh8t77jB+o/Rpw==
-----END CERTIFICATE-----
27 changes: 27 additions & 0 deletions ldap_password/dockerfiles/nginx/cert/ca.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAxeiUC4XYnXcok3Dn8HgUXoZ3rQvQU71hZWHMJ0oYtqXpci7O
PuBRvGlsD9MZQuor2X+E+qts+P/yD3ospM45fonm+6JqA0IzjbBV4KA24E1LWCfh
5+DJ5s6r/BHavEYeyFTh6FoU6YFrmZLt7hkYzpUGzMCzYlDKXhL3qSKA0iAuMy85
h4lCguLLHWEa/LUxO2Njy/fEvt+CserTnz360jCtiAUNgF4WYX8MB3japIu+SwLi
hkhVOUpgE54Hbg9Id+cHTomFaBKzl4XG9HbZP255Y/sja5bQ4vSI0/NM9OK4eh5O
mYN7Bu+ED6olZBH6mtofKi0lIQ2VUXRQH+k4AQIDAQABAoIBAFyr66b5pdUWVwmz
dOhFUkRw8tk1DvgnVdQDV3WOXMQqLIYrJKiMobl4JAHE9689uArAi6RVYVG3h8F3
lDAX4RQ/vslV5A5ikYFncM8eNpQRnZZKFp5dxC0v2ZjPQ32l2AQ2uxHyHJi64Yeo
JYG4fsU9Q1HdaiI/coNanl20ql25oEquT7jUotyc8WITeV7+3dqEa1t055UGvOkk
arFOPaLtZp0SqA9iEGPIwgLGXTp9wq2P4B+cO0FTRv3aL0mZwP1d+UdPHLs71Nl9
UbnnQxSeSkCCxahshXTx9kD2ZpuDnGRUPfeldePf18FC/wqfPa+ZJ7xHer22nbvL
MqUBV4ECgYEAziCItXc49ZFZoIpE/BB/T7hBUNDG+v6/c1yl9oEn6Uux0gKxhN5m
FlxaJ/ifl18wLkBnj+Pqj5ZRJu7xwQvub0/CV9DD3ACCnwG4EpDGJcsr4x1oxj/K
kXUTQKst9AH9Ir3ZmtrrRPrmQD/tftIl5drSDVyxvUWVaRB1VX2IBdcCgYEA9cr8
ySSQq5Ci8XTnkha4LRzf0qYIdD7N9U6VlSDQicY0CIwOWirTso6thKmbVOHUPsu4
Tjvj0jQR+s1fSQVsTicVjDXk3E3/h3XisyC+380kKixNcNTjn4Rf/LkVGcznybkx
doPWkDJLgO6/DPaTHoDXjtIo/qNEKBic488PRecCgYEAg8y3vVijWhn7djSTUZ12
2lGVqgglAz66yhf2or0I+RqGdCN2wN+35RpeJ2rJGPArjZdu4Mm6JN/Xug5VFLv9
VL1qJd5+LgFBhEyEF5LssCPORyV55jHJ4+I5UkNiWcCfzIQaTPMoNm47pd96i3nx
85xMbXDU0ZJZq9lzPRvMSvcCgYEAuTkls8JdTxyo3gJ1+64pTr3CobBDEK6/cEuv
B3l6DUkSrxo0OpipfZZthlp11spzsnq8wh/5t89LeU/IrXNrwZ1MbKO0epxAoukg
VFKp5GdoCGvoU83qVqxf1Uf4cb/rMCXh82i4iWONaHUB/hfWmBcJ2fPftrx8QScD
G91OqiMCgYADhJZl/sCWw9NCrX3bFDokAke001Uh+jwan0Y5AKjWMaGd78Ofek2M
cLv7yVXN90v0W2Hpl3dHur2CA6CPAyxm1X+WaR6hTVk8ZH2w/lkPPVilZpF+NH7u
b2jNs4OWAIQeHId94OxSyxXFzClvUdV7sWL5Yjkvcdy1oolIilQyrw==
-----END RSA PRIVATE KEY-----

0 comments on commit 4d2b6c3

Please sign in to comment.