Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #125 #127 #129 #130 #132 #133 #131

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Fix #125 #127 #129 #130 #132 #133 #131

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b38cd7f
Fix #127 - Renamed env KEYS_FOLDER to SATOSA_KEYS_FOLDER and added a…
MdreW Feb 22, 2024
138e9f5
fix #129 - Rename HOSTNAME env in SATOSA_HOSTNAME
MdreW Feb 22, 2024
05c1f27
fix #125 - SATOSA_REQUESTED_ATTRIBUTES env splitted in SATOSA_REQUEST…
MdreW Feb 22, 2024
7401aff
fix #130 - reordered satosa-saml2spid environments
MdreW Feb 22, 2024
7a6b1af
Fix #132 - Renamed $KEYS_FOLDER to $SATOSA_KEYS_FOLDER
MdreW Feb 23, 2024
3c71941
Listed cie attributes
MdreW Feb 23, 2024
1e87296
fix #133
MdreW Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Docker-compose/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MONGO_DBUSER=satosa
MONGO_DBPASSWORD=thatpassword
HOSTNAME=localhost
KEYS_FOLDER=./pki
SATOSA_HOSTNAME=localhost
SATOSA_KEYS_FOLDER=./pki
9 changes: 5 additions & 4 deletions Docker-compose/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
HOSTNAME=localhost
SATOSA_HOSTNAME=localhost

# MongoDB authentication
MONGO_DBUSER=satosa
MONGO_DBPASSWORD=thatpassword

# The path containing your secrets
KEYS_FOLDER=./pki
SATOSA_KEYS_FOLDER=./pki
# Keys filename
SATOSA_PRIVATE_KEY_FILENAME=privkey.pem
SATOSA_PUBLIC_KEY=cert.pem
Expand Down Expand Up @@ -43,7 +43,8 @@ SATOSA_UI_LOGO_WIDTH="80"
SATOSA_UI_LOGO_URL="https://example_organization.org/logo.png"
SATOSA_UI_PRIVACY_URL_EN="https://example_organization.org/privacy"
SATOSA_UI_PRIVACY_URL_IT="https://example_organization.org/it/privacy"
SATOSA_REQUESTED_ATTRIBUTES=[]
SATOSA_REQUESTED_SPID_ATTRIBUTES=[]
SATOSA_REQUESTED_CIE_ATTRIBUTES=[]

# If set to true, satosa downloads IDEM's keys and IDPs from registry.spid.gov.it
GET_IDEM_MDQ_KEY=true
GET_IDEM_MDQ_KEY=true
32 changes: 14 additions & 18 deletions Docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,39 +62,35 @@ services:
depends_on:
- satosa-mongo
environment:
- BASE_DIR=/satosa_proxy
- SATOSA_BY_DOCKER=1
- GET_IDEM_MDQ_KEY=${GET_IDEM_MDQ_KEY:-true}

- SATOSA_BASE=https://${HOSTNAME:-localhost}
- SATOSA_BASE_STATIC=https://${HOSTNAME:-localhost}/static
- SATOSA_DISCO_SRV=https://${HOSTNAME:-localhost}/static/disco.html
- SATOSA_UNKNOW_ERROR_REDIRECT_PAGE=https://${HOSTNAME:-localhost}/static/error_page.html
- BASE_DIR=/satosa_proxy
- SATOSA_PRIVATE_KEY=${SATOSA_KEYS_FOLDER:-./pki}/${SATOSA_PRIVATE_KEY_FILENAME:-privkey.pem}
- SATOSA_PUBLIC_KEY=${SATOSA_KEYS_FOLDER:-./pki}/${SATOSA_CERT_FILENAME:-cert.pem}
- SATOSA_BASE=https://${SATOSA_HOSTNAME:-localhost}
- SATOSA_BASE_STATIC=https://${SATOSA_HOSTNAME:-localhost}/static
- SATOSA_DISCO_SRV=https://${SATOSA_HOSTNAME:-localhost}/static/disco.html
- SATOSA_UNKNOW_ERROR_REDIRECT_PAGE=https://${SATOSA_HOSTNAME:-localhost}/static/error_page.html

- MONGODB_USERNAME=${MONGO_DBUSER:-satosa}
- MONGODB_PASSWORD=${MONGO_DBPASSWORD:-thatpassword}
- SATOSA_ENCRYPTION_KEY=${SATOSA_ENCRYPTION_KEY:-CHANGE_ME!}
- SATOSA_SALT=${SATOSA_SALT:-CHANGE_ME!}
- SATOSA_STATE_ENCRYPTION_KEY=${SATOSA_STATE_ENCRYPTION_KEY:-CHANGE_ME!}

- SATOSA_CONTACT_PERSON_EMAIL_ADDRESS=${SATOSA_CONTACT_PERSON_EMAIL_ADDRESS:-support.example@organization.org}
- SATOSA_CONTACT_PERSON_TELEPHONE_NUMBER=${SATOSA_CONTACT_PERSON_TELEPHONE_NUMBER:-+3906123456789}
- SATOSA_CONTACT_PERSON_FISCALCODE=${SATOSA_CONTACT_PERSON_FISCALCODE:-XXXXXX00X00X000Y}
- SATOSA_CONTACT_PERSON_GIVEN_NAME=${SATOSA_CONTACT_PERSON_GIVEN_NAME:-Contact Me}
- SATOSA_CONTACT_PERSON_IPA_CODE=${SATOSA_CONTACT_PERSON_IPA_CODE:-ipa00c}
- SATOSA_CONTACT_PERSON_MUNICIPALITY=${SATOSA_CONTACT_PERSON_MUNICIPALITY:-H501}

- SATOSA_ENCRYPTION_KEY=${SATOSA_ENCRYPTION_KEY:-CHANGE_ME!}

- SATOSA_ORGANIZATION_DISPLAY_NAME_EN=${SATOSA_ORGANIZATION_DISPLAY_NAME_EN:-Example Organization}
- SATOSA_ORGANIZATION_DISPLAY_NAME_IT=${SATOSA_ORGANIZATION_DISPLAY_NAME_IT:-Example Organization}
- SATOSA_ORGANIZATION_NAME_EN=${SATOSA_ORGANIZATION_NAME_EN:-example_organization}
- SATOSA_ORGANIZATION_NAME_IT=${SATOSA_ORGANIZATION_NAME_IT:-example_organization}
- SATOSA_ORGANIZATION_URL_EN=${SATOSA_ORGANIZATION_URL_EN:-https://example_organization.org}
- SATOSA_ORGANIZATION_URL_IT=${SATOSA_ORGANIZATION_URL_IT:-https://example_organization.org/it}

- SATOSA_PRIVATE_KEY=${KEYS_FOLDER}/${SATOSA_PRIVATE_KEY_FILENAME:-privkey.pem}
- SATOSA_PUBLIC_KEY=${KEYS_FOLDER}/${SATOSA_CERT_FILENAME:-cert.pem}
- SATOSA_SALT=${SATOSA_SALT:-CHANGE_ME!}

- SATOSA_STATE_ENCRYPTION_KEY=${SATOSA_STATE_ENCRYPTION_KEY:-CHANGE_ME!}

- SATOSA_UI_DESCRIPTION_EN=${SATOSA_UI_DESCRIPTION_EN:-Resource description}
- SATOSA_UI_DESCRIPTION_IT=${SATOSA_UI_DESCRIPTION_IT:-Resource description}
- SATOSA_UI_DISPLAY_NAME_EN=${SATOSA_UI_DISPLAY_NAME_EN:-Resource Display Name}
Expand All @@ -107,9 +103,9 @@ services:
- SATOSA_UI_PRIVACY_URL_EN=${SATOSA_UI_PRIVACY_URL_EN:-https://example_organization.org/privacy}
- SATOSA_UI_PRIVACY_URL_IT=${SATOSA_UI_PRIVACY_URL_IT:-https://example_organization.org/it/privacy}
- SATOSA_USER_ID_HASH_SALT=${SATOSA_USER_ID_HASH_SALT:-CHANGE_ME!}
- SATOSA_REQUESTED_ATTRIBUTES=${SATOSA_REQUESTED_ATTRIBUTES:-[]}

- GET_IDEM_MDQ_KEY=${GET_IDEM_MDQ_KEY:-true}
- SATOSA_REQUESTED_SPID_ATTRIBUTES=${SATOSA_REQUESTED_SPID_ATTRIBUTES:-[]}
- SATOSA_REQUESTED_CIE_ATTRIBUTES=${SATOSA_REQUESTED_CIE_ATTRIBUTES:-[]}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MdreW could you please add default values, considering the conventional spid or cie sets?

expose:
- 10000
ports:
Expand Down Expand Up @@ -146,7 +142,7 @@ services:
networks:
- satosa-saml2spid
environment:
- NGINX_HOST=${HOSTNAME:-localhost}
- NGINX_HOST=${SATOSA_HOSTNAME:-localhost}

spid-samlcheck:
image: italia/spid-saml-check
Expand Down
2 changes: 1 addition & 1 deletion example/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# get IDEM MDQ key
if [[ $GET_IDEM_MDQ_KEY == true ]]; then
wget https://mdx.idem.garr.it/idem-mdx-service-crt.pem -O $KEYS_FOLDER/idem-mdx-service-crt.pem
wget https://mdx.idem.garr.it/idem-mdx-service-crt.pem -O $SATOSA_KEYS_FOLDER/idem-mdx-service-crt.pem
wget https://registry.spid.gov.it/metadata/idp/spid-entities-idps.xml -O metadata/idp/spid-entities-idps.xml
echo "Downloaded IDEM MDQ key"
fi
Expand Down
2 changes: 1 addition & 1 deletion example/plugins/backends/ciesaml2_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ config:
'dateOfBirth',
'fiscalNumber',
]
requested_attributes: !ENV SATOSA_REQUESTED_ATTRIBUTES
requested_attributes: !ENV SATOSA_REQUESTED_CIE_ATTRIBUTES
#optional_attributes: ['gender',
# 'companyName',
# 'registeredOffice',
Expand Down
2 changes: 1 addition & 1 deletion example/plugins/backends/spidsaml2_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ config:

# this instantiate the attribute_consuming_service
required_attributes: ['spidCode', 'name', 'familyName', 'fiscalNumber', 'email']
requested_attributes: !ENV SATOSA_REQUESTED_ATTRIBUTES
requested_attributes: !ENV SATOSA_REQUESTED_SPID_ATTRIBUTES
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please set default values along with this ENV? (eg, :-default ...)

could you please provide in this PR the CIE attribute-maps in the example folder and use a default parameter that points there?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MdreW ^

#optional_attributes: ['gender',
# 'companyName',
# 'registeredOffice',
Expand Down
Loading