Skip to content

Taxii2 major Bug fixes and enhancements for production use #272

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.

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

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1380888
Configure taxii2 server
aams-eam Dec 25, 2023
b8a5b75
Fix problem with encoding of UUIDs
aams-eam Dec 27, 2023
067831a
Add public argument to create public api roots
aams-eam Dec 27, 2023
18d7a89
Add authentication for taxii2
aams-eam Dec 27, 2023
171e99b
Fix error for opentaxii-sync-data
aams-eam Dec 29, 2023
8c60407
Fix problem with can_read function
aams-eam Dec 29, 2023
63fae86
Fixed write access to collections
aams-eam Dec 29, 2023
d54a754
Add script for push, pull, and subscribe
aams-eam Jan 2, 2024
056eb8d
Fix docker-compose.yml
aams-eam Jan 2, 2024
1e5658d
Deleting unused var
aams-eam Jan 13, 2024
5b7128e
Fixes in create account command and taxii2 delete objects API
priyank-bhuva-crestdata Nov 5, 2024
9d5438c
Minor changes
priyank-bhuva-crestdata Nov 6, 2024
54673b0
Minor fixes
priyank-bhuva-crestdata Nov 6, 2024
7d8e699
Merge remote-tracking branch 'upstream/aamseam-taxii2-fix' into taxii…
priyank-bhuva-crestdata Nov 6, 2024
0bc2f59
Fixed DB issues
priyank-bhuva-crestdata Nov 12, 2024
056fa76
Merge remote-tracking branch 'origin/taxii2-fixes' into taxii2-merged…
priyank-bhuva-crestdata Nov 12, 2024
e7f3e38
Added a new command to delete accounts
priyank-bhuva-crestdata Nov 12, 2024
ee6d722
Merge branch 'taxii2-fixes' into taxii2-merged-fixes
priyank-bhuva-crestdata Nov 12, 2024
22249de
Fixed data duplication for versioning
priyank-bhuva-crestdata Nov 13, 2024
a5e883b
Merge remote-tracking branch 'origin/taxii2-fixes' into taxii2-merged…
priyank-bhuva-crestdata Nov 13, 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
Prev Previous commit
Next Next commit
Fix error for opentaxii-sync-data
When a collection that does not exist is used in a data-configuration
file, a warning is produced
  • Loading branch information
aams-eam committed Dec 29, 2023
commit 171e99bfb47b9280818a0f488ea3c6945271f150
8 changes: 5 additions & 3 deletions opentaxii/auth/manager.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import structlog
from opentaxii.persistence.exceptions import DoesNotExistError

log = structlog.getLogger(__name__)

Expand Down Expand Up @@ -58,11 +59,12 @@ def update_account(self, account, password):
# Check for taxii2 collections
for api_root, collections in list(account.permissions.get("taxii2", {}).items()):
for colname, permission in collections.items():
collection = self.server.servers.taxii2.persistence.get_collection(api_root, colname)
if not collection:
try:
collection = self.server.servers.taxii2.persistence.get_collection(api_root, colname)
except DoesNotExistError:
log.warning(
"update_account.unknown_collection",
collection=colname)
api_root=api_root, collection=colname)
else:
permission_collections[str(collection.id)] = permission

Expand Down