Skip to content

Commit bf22cf1

Browse files
authored
Copy dependency on st2-auth-backend-pam from st2-packages.git (#6306)
2 parents 49f61fc + 4988fbb commit bf22cf1

File tree

12 files changed

+147
-123
lines changed

12 files changed

+147
-123
lines changed

BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ target(
6565
dependencies=[
6666
"//:reqs#st2-auth-backend-flat-file",
6767
"//:reqs#st2-auth-ldap",
68+
"//:reqs#st2-auth-backend-pam",
6869
],
6970
)
7071

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Added
7878
working on StackStorm, improve our security posture, and improve CI reliability thanks in part
7979
to pants' use of PEX lockfiles. This is not a user-facing addition.
8080
#6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253
81-
#6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287
81+
#6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287 #6306
8282
Contributed by @cognifloyd
8383
* Build of ST2 EL9 packages #6153
8484
Contributed by @amanda11

conf/st2.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ token_ttl = 86400
8484
# Standalone mode options - options below only apply when auth service is running in the standalone
8585
# mode.
8686

87-
# Authentication backend to use in a standalone mode. Available backends: flat_file, ldap.
87+
# Authentication backend to use in a standalone mode. Available backends: flat_file, ldap, pam.
8888
backend = flat_file
8989
# JSON serialized arguments which are passed to the authentication backend in a standalone mode.
9090
backend_kwargs = None

fixed-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ lockfile==0.12.2
2828
mongoengine==0.29.1
2929
networkx==3.1
3030
# jsonpath-rw is the only thing that depends on decorator (a transitive dep)
31-
decorator==5.1.1
31+
decorator==5.2.1
3232
# 202403: Bump oslo.config for py3.10 support.
3333
oslo.config==9.6.0
3434
oslo.utils==7.3.0
@@ -80,7 +80,7 @@ bcrypt==4.2.1
8080
jinja2==3.1.5
8181
mock==5.1.0
8282
pytest==7.0.1
83-
psutil==6.1.1
83+
psutil==7.0.0
8484
python-dateutil==2.9.0.post0
8585
python-statsd==2.1.0
8686
orjson==3.10.15

lockfiles/st2.lock

Lines changed: 132 additions & 114 deletions
Large diffs are not rendered by default.

requirements-pants.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ stevedore
7878
# For backward compatibility reasons, flat file backend is installed by default
7979
st2-auth-backend-flat-file
8080
st2-auth-ldap @ git+https://github.com/StackStorm/st2-auth-ldap.git@master
81+
st2-auth-backend-pam @ git+https://github.com/StackStorm/st2-auth-backend-pam.git@master
8182
st2-rbac-backend @ git+https://github.com/StackStorm/st2-rbac-backend.git@master
8283
# tabulate used by tools/log_watcher.py
8384
tabulate

requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cffi==1.17.1
1515
chardet==5.2.0
1616
ciso8601
1717
cryptography==43.0.3
18-
decorator==5.1.1
18+
decorator==5.2.1
1919
dnspython
2020
editor==1.6.6
2121
eventlet==0.39.0
@@ -42,7 +42,7 @@ paramiko==3.5.1
4242
passlib==1.7.4
4343
prettytable==3.10.2
4444
prompt-toolkit==3.0.50
45-
psutil==6.1.1
45+
psutil==7.0.0
4646
pyOpenSSL
4747
pygments==2.19.1
4848
pyinotify==0.9.6 ; platform_system=="Linux"
@@ -66,6 +66,7 @@ simplejson
6666
six==1.17.0
6767
sseclient-py==1.8.0
6868
st2-auth-backend-flat-file
69+
st2-auth-backend-pam@ git+https://github.com/StackStorm/st2-auth-backend-pam.git@master
6970
st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master
7071
st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master
7172
stevedore==5.3.0

st2auth/in-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ stevedore
99
# For backward compatibility reasons, flat file backend is installed by default
1010
st2-auth-backend-flat-file
1111
st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master
12+
# This requirement has been injected by st2-packages.git for many years.
13+
st2-auth-backend-pam@ git+https://github.com/StackStorm/st2-auth-backend-pam.git@master
1214
gunicorn

st2auth/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ passlib==1.7.4
1313
pymongo==4.6.3
1414
six==1.17.0
1515
st2-auth-backend-flat-file
16+
st2-auth-backend-pam@ git+https://github.com/StackStorm/st2-auth-backend-pam.git@master
1617
st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master
1718
stevedore==5.3.0

st2common/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cffi==1.17.1
1212
chardet==5.2.0
1313
ciso8601
1414
cryptography==43.0.3
15-
decorator==5.1.1
15+
decorator==5.2.1
1616
dnspython
1717
eventlet==0.39.0
1818
flex==6.14.1

0 commit comments

Comments
 (0)