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

OpenRecords v3.4.16 Post Deployment Updates #565

Merged
merged 1 commit into from
Sep 20, 2023
+24 −24
Merged

OpenRecords v3.4.16 Post Deployment Updates #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions app/auth/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
abort, current_app, flash, redirect, request, session, url_for
)
from flask_login import current_user, login_user, logout_user
from hashlib import sha1
from hashlib import sha256
from ldap3 import Connection, Server, Tls
from requests.exceptions import SSLError

Expand Down Expand Up @@ -680,10 +680,10 @@ def _generate_signature(password, string):
"""
signature = None
try:
hmac_sha1 = hmac.new(key=password.encode(),
msg=string.encode(),
digestmod=sha1)
signature = hmac_sha1.hexdigest()
hmac_sha256 = hmac.new(key=password.encode(),
msg=string.encode(),
digestmod=sha256)
signature = hmac_sha256.hexdigest()
except Exception as e:
sentry.captureException()
current_app.logger.error("Failed to generate NYC ID.Web Services "
Expand Down
4 changes: 2 additions & 2 deletions data/agencies.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"032A","032","Social Services","Commission to Combat Police Corruption","CCPC","00001","[email protected]","[email protected]","False"
"0054","054","Public Safety","Civilian Complaint Review Board","CCRB","00001","[email protected]","[email protected]","False"
"0312","312","Civic Services","Conflicts of Interest Board","COIB","00001","[email protected]","[email protected]","False"
"0866","866","Business","Department of Consumer Affairs","DCA","00001","dcafoil@dca.nyc.gov","dcafoil@dca.nyc.gov","False"
"0866","866","Business","Department of Consumer and Worker Protection","DCWP","00001","FOIL@dcwp.nyc.gov","FOILAPPEALS@dcwp.nyc.gov","False"
"0868","868","Civic Services","Department of Citywide Administrative Services","DCAS","00001","[email protected]","[email protected]","False"
"0126","126","Culture & Recreation","Department of Cultural Affairs","DCLA","00001","[email protected]","[email protected]","False"
"0030","030","Civic Services","Department of City Planning","DCP","00001","[email protected]","[email protected]","False"
Expand All @@ -33,7 +33,7 @@
"0836","836","Business","Department of Finance","DOF","00001","[email protected]","[email protected]","False"
"0816","816","Health","Department of Health and Mental Hygiene","DOHMH","00001","[email protected]","[email protected]","False"
"0032","032","Public Safety","Department of Investigation","DOI","00001","[email protected]","[email protected]","False"
"0858","858","Civic Services","Department of Information Technology and Telecommunications","DOITT","00001","foilrequest@doitt.nyc.gov","foilrequest@doitt.nyc.gov","True"
"0858","858","Civic Services","NYC Office of Technology and Innovation","OTI","00001","foilrequest@oti.nyc.gov","foilappeal@oti.nyc.gov","True"
"0781","781","Public Safety","Department of Probation","DOP","00001","[email protected]","[email protected]","False"
"0860","860","Culture & Recreation","Department of Records and Information Services","DORIS","00001","[email protected]","[email protected]","True"
"0841","841","Transportation","Department of Transportation","DOT","00001","[email protected]","[email protected]","False"
Expand Down
16 changes: 8 additions & 8 deletions data/agencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@
"categories": [
"Business"
],
"name": "Department of Consumer Affairs",
"name": "Department of Consumer and Worker Protection",
"next_request_number": 1,
"default_email": "dcafoil@dca.nyc.gov",
"appeals_email": "DCAFOILAPPEALS@dca.nyc.gov",
"default_email": "FOIL@dcwp.nyc.gov",
"appeals_email": "FOILAPPEALS@dcwp.nyc.gov",
"is_active": true,
"agency_features": {
"letters": {
Expand All @@ -186,7 +186,7 @@
"text": ""
}
},
"acronym": "DCA"
"acronym": "DCWP"
},
{
"ein": "0059",
Expand Down Expand Up @@ -1003,10 +1003,10 @@
"categories": [
"Civic Services"
],
"name": "Department of Information Technology and Telecommunications",
"name": "NYC Office of Technology and Innovation",
"next_request_number": 1,
"default_email": "foilrequest@doitt.nyc.gov",
"appeals_email": "foilrequest@doitt.nyc.gov",
"default_email": "foilrequest@oti.nyc.gov",
"appeals_email": "foilappeal@oti.nyc.gov",
"is_active": true,
"agency_features": {
"letters": {
Expand All @@ -1026,7 +1026,7 @@
"text": ""
}
},
"acronym": "DOITT"
"acronym": "OTI"
},
{
"ein": "0134",
Expand Down
4 changes: 2 additions & 2 deletions data/agencies_test.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"032A","032","Social Services","Commission to Combat Police Corruption","CCPC","00001","[email protected]","[email protected]","False"
"0054","054","Public Safety","Civilian Complaint Review Board","CCRB","00001","[email protected]","[email protected]","False"
"0312","312","Civic Services","Conflicts of Interest Board","COIB","00001","[email protected]","[email protected]","False"
"0866","866","Business","Department of Consumer Affairs","DCA","00001","[email protected]","[email protected]","False"
"0866","866","Business","Department of Consumer and Worker Protection","DCWP","00001","[email protected]","[email protected]","False"
"0868","868","Civic Services","Department of Citywide Administrative Services","DCAS","00001","[email protected]","[email protected]","False"
"0126","126","Culture & Recreation","Department of Cultural Affairs","DCLA","00001","[email protected]","[email protected]","False"
"0030","030","Civic Services","Department of City Planning","DCP","00001","[email protected]","[email protected]","False"
Expand All @@ -33,7 +33,7 @@
"0836","836","Business","Department of Finance","DOF","00001","[email protected]","[email protected]","False"
"0816","816","Health","Department of Health and Mental Hygiene","DOHMH","00001","[email protected]","[email protected]","False"
"0032","032","Public Safety","Department of Investigation","DOI","00001","[email protected]","[email protected]","False"
"0858","858","Civic Services","Department of Information Technology and Telecommunications","DOITT","00001","[email protected]","[email protected]","True"
"0858","858","Civic Services","NYC Office of Technology and Innovation","OTI","00001","[email protected]","[email protected]","True"
"0781","781","Public Safety","Department of Probation","DOP","00001","[email protected]","[email protected]","False"
"0860","860","Culture & Recreation","Department of Records and Information Services","DORIS","00001","[email protected]","[email protected]","True"
"0841","841","Transportation","Department of Transportation","DOT","00001","[email protected]","[email protected]","False"
Expand Down
8 changes: 4 additions & 4 deletions data/agencies_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,8 @@
"categories": [
"Business"
],
"name": "Department of Consumer Affairs",
"acronym": "DCA",
"name": "Department of Consumer and Worker Protection",
"acronym": "DCWP",
"next_request_number": 1,
"default_email": "[email protected]",
"appeals_email": "[email protected]",
Expand Down Expand Up @@ -1094,8 +1094,8 @@
"categories": [
"Civic Services"
],
"name": "Department of Information Technology and Telecommunications",
"acronym": "DOITT",
"name": "NYC Office of Technology and Innovation",
"acronym": "OTI",
"next_request_number": 1,
"default_email": "[email protected]",
"appeals_email": "[email protected]",
Expand Down
6 changes: 3 additions & 3 deletions data/custom_request_forms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@
"name": "fdny-form1-field9",
"values": [
"Building",
"Transportation",
"Vehicle/Transportation",
"Outdoors",
"Non-Fire Emergency"
],
"help_text": "If transportation is selected, please provide the model, make, and license plate in the description below. For Building, Outdoors, and Non-Fire Emergency please provide a short description below.",
"help_text": "If Vehicle/Transportation is selected, please provide the model, make, and license plate in the description below. For Building, Outdoors, and Non-Fire Emergency please provide a short description below.",
"required": false
}
},
Expand All @@ -169,7 +169,7 @@
"error_message": "<span class=\"glyphicon glyphicon-exclamation-sign\"></span>&nbsp;<strong>Error, Description of Incident is required.</strong> Please provide a short description.",
"max_length": 5000,
"character_counter": true,
"help_text": "Please provide a short description of the incident. If Transportation was selected above, please make sure to provide the Type, Make, and Plate of the vehicle."
"help_text": "Please provide a short description of the incident. If Vehicle/Transportation was selected above, please make sure to provide the Type, Make, and Plate of the vehicle."
}
}
],
Expand Down