ASWI - Pokročilé softwarové inženýrství » ASWI 2021 » Aplikace pro správu X.509 certifikátů (Yoso Czech s.r.o.) - JMSD

Merge branch 'master' into 8652_date_storage

1. Conflicts:
2. src/db/init_queries.py

Delete init_queries.py

Re #8652 - Fixed format & merge conflict.

Re #8927 - Improved loading scripts into DB

Merge branch 'master' into '8586_response_code_updates'

1. Conflicts:
2. src/controllers/certificates_controller.py

Re #8589 - Added a log check to test if the directory exists and if not, print error.

Re #8589 - Updated CertificateController in order to use the new get_root function of CertService.

Merge remote-tracking branch 'origin/8779_Disable_logging_during_tests' into merge_8589_8880_8779

Merge remote-tracking branch 'origin/8880_Improve_FileAnchor' into merge_8589_8880_8779

Merge remote-tracking branch 'origin/8589_Implement_get_root' into merge_8589_8880_8779

Re #8884 - Deleted constants of exception messages

Re #8884 - Improved exceptions in repositories

Re #8586 - Removed duplicate PASSWORD declaration, 205 -> 200 on empty lists, 205 -> 404 otherwise.

Re #8586 - Removed the 205 return code.

Re #8652 - Updated the `cert_to_dict` functions in order to keep returning the formatted date as opposed to the value stored in db (which is not a timestamp).

Re #8652 - Updated the way valid_from/to fields are stored (str -> int). Used `timegm` from `calendar` for time_struct to utc unix timestamp conversion.

Re #8652 - Removed redundant "== ''" checks for date types.

Re #8652 - Certificate date types updated (str -> int)

Re #8652 - Certificate table datatype updates (valid_from, valid_to, revocation_date, deletion_date: TEXT => INTEGER)

Re #8779 - Implemented disabling logging during tests

Re #8880 - Edited config file (inserted RootDir)
- improved creating of logs and db directories

Re #8589 - Implemented get_root(unique_id) in CertificateService

Merge branch 'master' into '8778_Subject_country_code_assertion'

1. Conflicts:
2. tests/integration_tests/rest_api/certificates_test.py

Moved global error handlers out of the CertificateController to a separate file.
Renamed generic exception handlers.

Added a global error handler for generic exceptions.
Covered the added global exception error handler in a test.

Added a global error handler for DatabaseException errors.
Covered the added global DatabaseException error handler in a test.

Added a global error handler for CryptographyException errors.
Added a dependency ony pytest-mock library in order to be able to mock method calls in tests.
Covered the added global CryptographyException error handler in a test.

Added a logger call when an invalid subject attribute error is raised in a request handler.

Empty country code is now considered as a valid country code when creating a new certificate.

Changed tests accordingly.

Improved InvalidSubjectAttribute string representation and added an "except" block in CertificateController that handles this error.

Added docstrings describing the reasons why an InvalidCertificateAttribute error might be raised in the CertificateService.

Added a new exception that is thrown when a subject with an invalid attribute is passed while creating a new certificate via CertificateService.

Added logging of OperationalError errors

Merge remote-tracking branch 'origin/8696_Improve_database_init'

Update swagger.yaml

Re #8696 - Added TODO to SQL query constant

Re #8696 - Improved DB creation
- secured start application without lost data

Re #8706 - Fixed a bug where certificates without usages would not be returned when the usage filter was unspecified. Added a related integration test.

Re #8706 - Extensions specification improvement

Merge branch 'resolve_conflicts_master'

1. Conflicts:
2. src/controllers/certificates_controller.py

Merge branch 'resolve_conflicts' into resolve_conflicts_master

1. Conflicts:
2. src/controllers/certificates_controller.py

Re #8705 - Fixed a merge conflict.

[Merge conflict] - reverted controller version from #8702

[Merge conflict] - reverted controller version from #8702

[Merge conflict] - reverted controller version from #8705

Merge branch 'master' into '8705_rapi_private_key'

1. Conflicts:
2. src/controllers/certificates_controller.py
3. src/services/cryptography.py
4. tests/integration_tests/rest_api/certificates_test.py
5. tests/integration_tests/services/certificate_service_test.py

Re #8705 - `verify_key` bugfix - added check whether the passed PEM is an actual key

Re #8705 - Review updates.

Re #8702 - Updated Certificate constructors in compliance with the recent database updates.

Merge branch '8702_augmented_filtering' into 'master'

8702 Augmented filtering of certificates

See merge request aswi/aswi-2021/aswi2021jmsd!25

Merge branch '8704_create_cert_extensions' into 'master'

8704 Let certificate extensions be specified via REST API

See merge request aswi/aswi-2021/aswi2021jmsd!24

Re #8704 - Minor fix (return code 500 -> 400)

Merge branch '8708_PKCS_Identity' into 'master'

8708 pkcs identity

See merge request aswi/aswi-2021/aswi2021jmsd!22

Re #8708 - Changed the generate_pkcs_identity method of the CertificateService in such way that the Certificate class instance is now passed instead of a certificate ID resulting in a decrease of SQL queries.

Re #8708 - Added a unit test covering a scenario in which an empty identity password is passed to the generate_pkcs_identity method of the CryptographyService

Improved the generate_pkcs_identity method in such way that when None is passed as the identity password then an empty string literal ("") is used instead.

Re #8704 - Minor fix (extensions default None -> "")

Re #8704 - Added the `extension` parameter to the create endpoint.

Re #8702 - Minor bug and flow fixes.

Re #8702 - Finished implementing filtering methods in the CertService.

Re #8702 - Added filtering methods to CertRepository.

Re #8708 - Changed /api/certificates/{id}/identity endpoint method back to POST (facepalm)

Changed REST API tests accordingly.

Merge branch '8590_Implement_subject_fields'

Re #8702 - Started implementing required CertService updates.

Re #8702 - Reformed CertController's `get_list_of_certs` method, improved filtering logic.

Re #8708 - Changed the swagger.yaml accordingly to the previous REST API endpoint changes (/api/certificate/{id}/identity endpoint)

Changed method from POST to GET.
Changed 201 status code to 200.
Improved status code descriptions.
Improved ID parameter description....

Re #8708 - Changed the behaviour of the generate_pkcs_identity method in the CryptographyService that now does not use the -CAfile argument when the passed chain of trust is empty

Added a unit test verifying that the changed method works as expected when empty chain of trust is passed

Re #8708 - Added a new REST API endpoint used for generating a PKCS12 identities of certificates

Re #8708 - Implemented a new method in the CertificateService that does generate a PKCS12 identity by using the CryptographyService

Covered the new method with few integration tests
Fixed minor typos in the CertificateService

Re #8705 - Added the `find_pk` method to PKRepo.

Re #8705 - Added the `verify_key` method to CryptoService.

Re #8705 - Added wrapping methods and the `verify_key` method to KeyService.

Re #8705 - Adjusted CertController to handle all combinations of PEM/pass supply. Added calls to a not-yet-existing `verify_key(...)` method of PK service.

Re #8700 - Review merge.

Re #8708 - Implemented a new method in the CryptographyService that allows the caller to create a PKCS12 identity of a certificate and it's chain of trust

Covered the new method with unit tests.

Re #8590 - Modified IF statement
- revocation data can be None

Re #8590 - Modified methods due to fields of subject implemented

Re #8590 - Implemented all fields of subject into DB

Hotfix - logpath definition

Merge branch 'master' into '8670_Enhance_revocation_logic'

1. Conflicts:
2. src/dao/certificate_repository.py

Re #8707 - Logging of used config file improved

Re #8707 - Log level mapping via dictionary, minor adjustments during review

Re #8670 - Covered certificate_repository by the CRUD tests

Re #8707 - Added logging for the new functionality

Re #8707 - Enhanced logging to set log level based on config file

Re #8707 - Implemented get_certificate_state() in CertificateRepository

Re #8707 - Implemented status in the controller, prepared method in CertificateService

Re #8707 - Added necessary state constants

Merge branch '8570_Implement_logging'

1. Conflicts:
2. src/services/certificate_service.py

Re #8670 - Modified deletion for historical storage of certificates

Re #8570 - Rotating file settings

Merge branch '8709_include_root_in_chain' into 'master'

Re #8709 - included root certificate into the trust chain

See merge request aswi/aswi-2021/aswi2021jmsd!17

Updated swagger.yaml

Re #8700 - Implemented certificate revalidation check and fixed affected tests

Re #8709 - included root certificate into the trust chain

Re #8570 - Added logs

Re #8570 - Messages logging

Certificate usage hotfix before DEMO #4 - digital signature does not specify timestamping

Re #8570 - Logger configuration
- implemented dictionary to string in utils
- implemented log functions with parameter message only (name of file, name of class and name of function
are getting automaticaly)

Update swagger.yaml

Merge branch 'master' into 8570_Implement_logging

1. Conflicts:
2. src/constants.py